about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-10-17 07:08:47 -0700
committerKartik Agaram <vc@akkartik.com>2018-10-17 07:08:47 -0700
commit104e521c04d1a0cad9c68fb11e250e12ad8917ef (patch)
treedf4258ad26cb78e25abee64c80aedab47aa461ea
parent800320a70c981008302af56b2f35a142c1101401 (diff)
downloadmu-104e521c04d1a0cad9c68fb11e250e12ad8917ef.tar.gz
4709
-rw-r--r--html/001help.cc.html16
-rw-r--r--html/003trace.cc.html551
-rw-r--r--html/003trace.test.cc.html88
-rw-r--r--html/010vm.cc.html6
-rw-r--r--html/011load.cc.html52
-rw-r--r--html/012transform.cc.html8
-rw-r--r--html/013update_operation.cc.html4
-rw-r--r--html/014literal_string.cc.html4
-rw-r--r--html/015literal_noninteger.cc.html4
-rw-r--r--html/016dilated_reagent.cc.html16
-rw-r--r--html/017parse_tree.cc.html4
-rw-r--r--html/018constant.cc.html6
-rw-r--r--html/019type_abbreviations.cc.html28
-rw-r--r--html/020run.cc.html36
-rw-r--r--html/021check_instruction.cc.html8
-rw-r--r--html/022arithmetic.cc.html110
-rw-r--r--html/023boolean.cc.html18
-rw-r--r--html/024jump.cc.html32
-rw-r--r--html/025compare.cc.html68
-rw-r--r--html/026call.cc.html12
-rw-r--r--html/027call_ingredient.cc.html12
-rw-r--r--html/028call_return.cc.html20
-rw-r--r--html/029tools.cc.html26
-rw-r--r--html/030container.cc.html72
-rw-r--r--html/031merge.cc.html24
-rw-r--r--html/032array.cc.html64
-rw-r--r--html/033exclusive_container.cc.html32
-rw-r--r--html/034address.cc.html42
-rw-r--r--html/035lookup.cc.html22
-rw-r--r--html/036abandon.cc.html12
-rw-r--r--html/038new_text.cc.html16
-rw-r--r--html/040brace.cc.html32
-rw-r--r--html/041jump_target.cc.html12
-rw-r--r--html/042name.cc.html26
-rw-r--r--html/043space.cc.html24
-rw-r--r--html/044space_surround.cc.html2
-rw-r--r--html/045closure_name.cc.html30
-rw-r--r--html/046check_type_by_name.cc.html22
-rw-r--r--html/050scenario.cc.html128
-rw-r--r--html/052tangle.cc.html34
-rw-r--r--html/053recipe_header.cc.html68
-rw-r--r--html/054static_dispatch.cc.html42
-rw-r--r--html/055shape_shifting_container.cc.html30
-rw-r--r--html/056shape_shifting_recipe.cc.html74
-rw-r--r--html/057immutable.cc.html32
-rw-r--r--html/058to_text.cc.html2
-rw-r--r--html/060rewrite_literal_string.cc.html4
-rw-r--r--html/062convert_ingredients_to_text.cc.html10
-rw-r--r--html/069hash.cc.html10
-rw-r--r--html/072recipe.cc.html26
-rw-r--r--html/073scheduler.cc.html34
-rw-r--r--html/074wait.cc.html68
-rw-r--r--html/076continuation.cc.html36
-rw-r--r--html/080display.cc.html26
-rw-r--r--html/082scenario_screen.cc.html26
-rw-r--r--html/085scenario_console.cc.html18
-rw-r--r--html/087file.cc.html58
-rw-r--r--html/089scenario_filesystem.cc.html36
-rw-r--r--html/091socket.cc.html62
-rw-r--r--html/099hardware_checks.cc.html4
-rw-r--r--html/100trace_browser.cc.html4
-rw-r--r--html/101run_sandboxed.cc.html20
-rw-r--r--html/subx/001help.cc.html69
-rw-r--r--html/subx/003trace.cc.html541
-rw-r--r--html/subx/003trace.test.cc.html88
-rw-r--r--html/subx/010---vm.cc.html702
-rw-r--r--html/subx/011run.cc.html112
-rw-r--r--html/subx/012elf.cc.html178
-rw-r--r--html/subx/013direct_addressing.cc.html787
-rw-r--r--html/subx/014indirect_addressing.cc.html590
-rw-r--r--html/subx/015immediate_addressing.cc.html158
-rw-r--r--html/subx/016index_addressing.cc.html16
-rw-r--r--html/subx/017jump_disp8.cc.html82
-rw-r--r--html/subx/018jump_disp16.cc.html86
-rw-r--r--html/subx/019functions.cc.html26
-rw-r--r--html/subx/020syscalls.cc.html104
-rw-r--r--html/subx/021byte_addressing.cc.html181
-rw-r--r--html/subx/028translate.cc.html332
-rw-r--r--html/subx/030---operands.cc.html838
-rw-r--r--html/subx/031check_operands.cc.html1069
-rw-r--r--html/subx/032check_operand_bounds.cc.html40
-rw-r--r--html/subx/034compute_segment_address.cc.html60
-rw-r--r--html/subx/035labels.cc.html402
-rw-r--r--html/subx/036global_variables.cc.html276
-rw-r--r--html/subx/038---literal_strings.cc.html38
-rw-r--r--html/subx/039debug.cc.html86
-rw-r--r--html/subx/040---tests.cc.html24
-rw-r--r--html/subx/050_write.subx.html105
-rw-r--r--html/subx/051test.subx.html150
-rw-r--r--html/subx/052kernel_string_equal.subx.html418
-rw-r--r--html/subx/053new_segment.subx.html26
-rw-r--r--html/subx/054string_equal.subx.html230
-rw-r--r--html/subx/055trace.subx.html373
-rw-r--r--html/subx/056write.subx.html311
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html203
-rw-r--r--html/subx/apps/factorial.subx.html147
-rw-r--r--html/subx/examples/ex1.subx.html20
-rw-r--r--html/subx/examples/ex10.subx.html45
-rw-r--r--html/subx/examples/ex11.subx.html545
-rw-r--r--html/subx/examples/ex12.subx.html14
-rw-r--r--html/subx/examples/ex2.subx.html22
-rw-r--r--html/subx/examples/ex3.subx.html8
-rw-r--r--html/subx/examples/ex4.subx.html63
-rw-r--r--html/subx/examples/ex5.subx.html26
-rw-r--r--html/subx/examples/ex6.subx.html16
-rw-r--r--html/subx/examples/ex7.subx.html92
-rw-r--r--html/subx/examples/ex8.subx.html26
-rw-r--r--html/subx/examples/ex9.subx.html14
108 files changed, 6703 insertions, 5449 deletions
diff --git a/html/001help.cc.html b/html/001help.cc.html
index cf25168c..fa9a953a 100644
--- a/html/001help.cc.html
+++ b/html/001help.cc.html
@@ -79,7 +79,7 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span>       &lt;&lt; <span class="Constant">&quot;Examples:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L19" class="LineNr"> 19 </span>       &lt;&lt; <span class="Constant">&quot;  To load files and run 'main':</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>       &lt;&lt; <span class="Constant">&quot;    mu file1.mu file2.mu ...</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L21" class="LineNr"> 21 </span>       &lt;&lt; <span class="Constant">&quot;  To run 'main' and dump a <a href='003trace.cc.html#L190'>trace</a> of all operations at the <a href='003trace.cc.html#L226'>end</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>       &lt;&lt; <span class="Constant">&quot;  To run 'main' and dump a <a href='003trace.cc.html#L189'>trace</a> of all operations at the <a href='003trace.cc.html#L225'>end</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L22" class="LineNr"> 22 </span>       &lt;&lt; <span class="Constant">&quot;    mu --trace file1.mu file2.mu ...</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>       &lt;&lt; <span class="Constant">&quot;  To run all tests:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>       &lt;&lt; <span class="Constant">&quot;    mu test</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -87,7 +87,7 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr"> 26 </span>       &lt;&lt; <span class="Constant">&quot;    mu test file1.mu file2.mu ...</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L27" class="LineNr"> 27 </span>       &lt;&lt; <span class="Constant">&quot;  To run a single Mu <a href='050scenario.cc.html#L57'>scenario</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L28" class="LineNr"> 28 </span>       &lt;&lt; <span class="Constant">&quot;    mu test file1.mu file2.mu ... <a href='050scenario.cc.html#L57'>scenario</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L29" class="LineNr"> 29 </span>       &lt;&lt; <span class="Constant">&quot;  To run a single Mu <a href='050scenario.cc.html#L57'>scenario</a> and dump a <a href='003trace.cc.html#L190'>trace</a> at the <a href='003trace.cc.html#L226'>end</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L29" class="LineNr"> 29 </span>       &lt;&lt; <span class="Constant">&quot;  To run a single Mu <a href='050scenario.cc.html#L57'>scenario</a> and dump a <a href='003trace.cc.html#L189'>trace</a> at the <a href='003trace.cc.html#L225'>end</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>       &lt;&lt; <span class="Constant">&quot;    mu --trace test file1.mu file2.mu ... <a href='050scenario.cc.html#L57'>scenario</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L31" class="LineNr"> 31 </span>       &lt;&lt; <span class="Constant">&quot;  To load files and run only the tests in explicitly loaded files (for apps):</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L32" class="LineNr"> 32 </span>       &lt;&lt; <span class="Constant">&quot;    mu --test-only-app test file1.mu file2.mu ...</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -101,7 +101,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span>       &lt;&lt; <span class="Constant">&quot;    mu --profile file_or_dir1 file_or_dir2 ...</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L41" class="LineNr"> 41 </span>       &lt;&lt; <span class="Constant">&quot;  this slices and dices time spent in various profile.* output files</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L42" class="LineNr"> 42 </span>       &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L43" class="LineNr"> 43 </span>       &lt;&lt; <span class="Constant">&quot;  To browse a <a href='003trace.cc.html#L190'>trace</a> generated by a previous run:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L43" class="LineNr"> 43 </span>       &lt;&lt; <span class="Constant">&quot;  To browse a <a href='003trace.cc.html#L189'>trace</a> generated by a previous run:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L44" class="LineNr"> 44 </span>       &lt;&lt; <span class="Constant">&quot;    mu browse-trace file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L45" class="LineNr"> 45 </span>       <span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -137,9 +137,9 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Normal">bool</span> <a href='001help.cc.html#L77'>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="L78" class="LineNr"> 78 </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="L79" class="LineNr"> 79 </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><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
+<span id="L79" class="LineNr"> 79 </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><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
 <span id="L80" class="LineNr"> 80 </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="L81" class="LineNr"> 81 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><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">//: I'll throw some style conventions here for want of a better place for them.</span>
@@ -271,12 +271,12 @@ if ('onhashchange' in window) {
 <span id="L210" class="LineNr">210 </span><span class="Comment">// from <a href="http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map">http://stackoverflow.com/questions/152643/idiomatic-c-for-reading-from-a-const-map</a></span>
 <span id="L211" class="LineNr">211 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type&amp; get<span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Normal">typename</span> T::iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
-<span id="L213" class="LineNr">213 </span>  assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">());</span>
+<span id="L213" class="LineNr">213 </span>  assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span>
 <span id="L214" class="LineNr">214 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<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">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; get<span class="Delimiter">(</span><span class="Normal">const</span> T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Normal">typename</span> T::const_iterator iter<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
-<span id="L218" class="LineNr">218 </span>  assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">());</span>
+<span id="L218" class="LineNr">218 </span>  assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span>
 <span id="L219" class="LineNr">219 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">,</span> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -285,7 +285,7 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span>  <span class="Identifier">return</span> value<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">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">bool</span> <a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Identifier">return</span> map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> != map<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Identifier">return</span> map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> != map<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
 <span id="L229" class="LineNr">229 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type&amp; <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L230" class="LineNr">230 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
diff --git a/html/003trace.cc.html b/html/003trace.cc.html
index e06c043e..c7c1a4e0 100644
--- a/html/003trace.cc.html
+++ b/html/003trace.cc.html
@@ -143,7 +143,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span>
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing <a href='003trace.cc.html#L190'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L87" class="LineNr"> 87 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing <a href='003trace.cc.html#L189'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L88" class="LineNr"> 88 </span>  Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(code)</span>
@@ -190,7 +190,7 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>
 <span id="L133" class="LineNr">133 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L133'>save</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L190'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L189'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L135" class="LineNr">135 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
 <span id="L136" class="LineNr">136 </span>    fout &lt;&lt; <a href='003trace.cc.html#L163'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L137" class="LineNr">137 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
@@ -207,7 +207,7 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span>  string curr_contents = curr_stream<span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
 <span id="L150" class="LineNr">150 </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="L151" class="LineNr">151 </span>    past_lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_depth<span class="Delimiter">,</span> <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>curr_label<span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L151" class="LineNr">151 </span>    past_lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_depth<span class="Delimiter">,</span> <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>curr_label<span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; curr_label == <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span>
 <span id="L153" class="LineNr">153 </span>        || Dump_trace
 <span id="L154" class="LineNr">154 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; curr_label == Dump_label<span class="Delimiter">))</span>
@@ -221,280 +221,279 @@ if ('onhashchange' in window) {
 <span id="L162" class="LineNr">162 </span>
 <span id="L163" class="LineNr">163 </span>string trace_stream::<a href='003trace.cc.html#L163'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L164" class="LineNr">164 </span>  ostringstream output<span class="Delimiter">;</span>
-<span id="L165" class="LineNr">165 </span>  label = <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L167" class="LineNr">167 </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 class="Delimiter">{</span>
+<span id="L165" class="LineNr">165 </span>  label = <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L167" class="LineNr">167 </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="L168" class="LineNr">168 </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>depth &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>contents &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span>    <span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L171" class="LineNr">171 </span><span class="Delimiter">}</span>
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L174" class="LineNr">174 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span><span class="Normal">int</span> Trace_errors = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
-<span id="L176" class="LineNr">176 </span>
-<span id="L177" class="LineNr">177 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L178" class="LineNr">178 </span><span class="Normal">bool</span> Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print even error trace lines to screen</span>
-<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> Dump_trace =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines to screen</span>
-<span id="L180" class="LineNr">180 </span>string Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines matching a single label to screen</span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L182" class="LineNr">182 </span>Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span>Dump_trace =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// toggle this to print traces to screen as they are emitted</span>
-<span id="L184" class="LineNr">184 </span>Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L187" class="LineNr">187 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
-<span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L190" class="LineNr">190 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
-<span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
-<span id="L193" class="LineNr">193 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
-<span id="L194" class="LineNr">194 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
-<span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Comment">// Errors are a special layer.</span>
-<span id="L197" class="LineNr">197 </span><span class="Comment">#define raise  (!Trace_stream ? (scroll_to_bottom_and_close_console(),++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
-<span id="L198" class="LineNr">198 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
-<span id="L199" class="LineNr">199 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
-<span id="L200" class="LineNr">200 </span><span class="Comment">#define assert_for_now assert</span>
-<span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Comment">//: Automatically close the console in some situations.</span>
-<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L204" class="LineNr">204 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L206'>scroll_to_bottom_and_close_console</a><span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span><span class="Delimiter">:(code)</span>
-<span id="L206" class="LineNr">206 </span><span class="Normal">void</span> <a href='003trace.cc.html#L206'>scroll_to_bottom_and_close_console</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!tb_is_active<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Comment">// leave the screen in a relatively clean state</span>
-<span id="L209" class="LineNr">209 </span>  tb_set_cursor<span class="Delimiter">(</span>tb_width<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">,</span> tb_height<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>  cout &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\r\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L211" class="LineNr">211 </span>  tb_shutdown<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="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
-<span id="L217" class="LineNr">217 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>  Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(code)</span>
-<span id="L221" class="LineNr">221 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Identifier">return</span> Trace_errors &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="L223" class="LineNr">223 </span><span class="Delimiter">}</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L226" class="LineNr">226 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L226'>end</a> <span class="Delimiter">{};</span>
-<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(code)</span>
-<span id="L228" class="LineNr">228 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='003trace.cc.html#L226'>end</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L231" class="LineNr">231 </span><span class="Delimiter">}</span>
-<span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L234" class="LineNr">234 </span><span class="Normal">bool</span> Save_trace =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
-<span id="L235" class="LineNr">235 </span>
-<span id="L236" class="LineNr">236 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L238" class="LineNr">238 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
-<span id="L239" class="LineNr">239 </span>  lease_tracer<span class="Delimiter">();</span>
-<span id="L240" class="LineNr">240 </span>  <a href='003trace.cc.html#L244'>~lease_tracer</a><span class="Delimiter">();</span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">};</span>
-<span id="L242" class="LineNr">242 </span><span class="Delimiter">:(code)</span>
-<span id="L243" class="LineNr">243 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L244" class="LineNr">244 </span>lease_tracer::<a href='003trace.cc.html#L244'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span>
-<span id="L248" class="LineNr">248 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L249" class="LineNr">249 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
-<span id="L250" class="LineNr">250 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L251" class="LineNr">251 </span><a href='003trace.cc.html#L249'>START_TRACING_UNTIL_END_OF_SCOPE</a>
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L254" class="LineNr">254 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
-<span id="L255" class="LineNr">255 </span>
-<span id="L256" class="LineNr">256 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
-<span id="L257" class="LineNr">257 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; <a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
-<span id="L259" class="LineNr">259 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span> \
-<span id="L260" class="LineNr">260 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
-<span id="L261" class="LineNr">261 </span>    Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L262" class="LineNr">262 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
-<span id="L263" class="LineNr">263 </span>  <span class="Delimiter">}</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Passed &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="L267" class="LineNr">267 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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="L268" class="LineNr">268 </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="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
-<span id="L270" class="LineNr">270 </span>    Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L271" class="LineNr">271 </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="L272" class="LineNr">272 </span>  <span class="Delimiter">}</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(code)</span>
-<span id="L277" class="LineNr">277 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L277'>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="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L280" class="LineNr">280 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L371'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L141'>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="L283" class="LineNr">283 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>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="L285" class="LineNr">285 </span>  string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>  <a href='003trace.cc.html#L309'>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="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L288" class="LineNr">288 </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="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents != <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><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">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L141'>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="L292" class="LineNr">292 </span>      ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>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="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L309'>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="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">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L322'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L298" class="LineNr">298 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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;): line [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L190'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Delimiter">}</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L302" class="LineNr">302 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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; contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L190'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr">303 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">}</span>
-<span id="L305" class="LineNr">305 </span>  Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>
-<span id="L309" class="LineNr">309 </span><span class="Normal">void</span> <a href='003trace.cc.html#L309'>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* contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L310" class="LineNr">310 </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="L311" class="LineNr">311 </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="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr">313 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>    *contents = <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>s<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>    *label = <a href='003trace.cc.html#L395'>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="L318" class="LineNr">318 </span>    *contents = <a href='003trace.cc.html#L395'>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="L319" class="LineNr">319 </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="Normal">bool</span> <a href='003trace.cc.html#L322'>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; contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents == <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Delimiter">}</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
-<span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L331" class="LineNr">331 </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="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="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L338" class="LineNr">338 </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="L339" class="LineNr">339 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span>
-<span id="L340" class="LineNr">340 </span>        ++result<span class="Delimiter">;</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 class="Identifier">return</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 id="L346" class="LineNr">346 </span><span class="Normal">int</span> <a href='003trace.cc.html#L346'>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="L347" class="LineNr">347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L349" class="LineNr">349 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L350" class="LineNr">350 </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="L351" class="LineNr">351 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L77'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">),</span> <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L352" class="LineNr">352 </span>        ++result<span class="Delimiter">;</span>
-<span id="L353" class="LineNr">353 </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">return</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 id="L358" class="LineNr">358 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> line<span class="Delimiter">)</span> == <span class="Constant">0</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="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L363" class="LineNr">363 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L386'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L365" class="LineNr">365 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or contents in <a href='003trace.cc.html#L190'>trace</a> line</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L366" class="LineNr">366 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Identifier">return</span> trace_doesnt_contain<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 id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span>vector&lt;string&gt; <a href='003trace.cc.html#L371'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L372" class="LineNr">372 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L373" class="LineNr">373 </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="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L226'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L376" class="LineNr">376 </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="L377" class="LineNr">377 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L378" class="LineNr">378 </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> end-begin<span class="Delimiter">));</span>
-<span id="L380" class="LineNr">380 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L381" class="LineNr">381 </span>    <a href='003trace.cc.html#L226'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span>  <span class="Delimiter">}</span>
-<span id="L383" class="LineNr">383 </span>  <span class="Identifier">return</span> result<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>vector&lt;string&gt; <a href='003trace.cc.html#L386'>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="L387" class="LineNr">387 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L388" class="LineNr">388 </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="L389" class="LineNr">389 </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> <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">));</span>
-<span id="L390" class="LineNr">390 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L226'>end</a> != string::npos<span class="Delimiter">)</span>
-<span id="L391" class="LineNr">391 </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="L392" class="LineNr">392 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L393" class="LineNr">393 </span><span class="Delimiter">}</span>
-<span id="L394" class="LineNr">394 </span>
-<span id="L395" class="LineNr">395 </span>string <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L396" class="LineNr">396 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L397" class="LineNr">397 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
-<span id="L398" class="LineNr">398 </span>    ++first<span class="Delimiter">;</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L402" class="LineNr">402 </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="L403" class="LineNr">403 </span>    --last<span class="Delimiter">;</span>
-<span id="L404" class="LineNr">404 </span>  ++last<span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
-<span id="L406" class="LineNr">406 </span><span class="Delimiter">}</span>
-<span id="L407" class="LineNr">407 </span>
-<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L409" class="LineNr">409 </span><span class="Comment">#include &lt;vector&gt;</span>
-<span id="L410" class="LineNr">410 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
-<span id="L411" class="LineNr">411 </span><span class="Comment">#include &lt;list&gt;</span>
-<span id="L412" class="LineNr">412 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
-<span id="L413" class="LineNr">413 </span><span class="Comment">#include &lt;set&gt;</span>
-<span id="L414" class="LineNr">414 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span>
-<span id="L416" class="LineNr">416 </span><span class="Comment">#include &lt;sstream&gt;</span>
-<span id="L417" class="LineNr">417 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L418" class="LineNr">418 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L419" class="LineNr">419 </span>
-<span id="L420" class="LineNr">420 </span><span class="Comment">#include &lt;fstream&gt;</span>
-<span id="L421" class="LineNr">421 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L422" class="LineNr">422 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
-<span id="L423" class="LineNr">423 </span>
-<span id="L424" class="LineNr">424 </span><span class="Comment">#include &quot;termbox/termbox.h&quot;</span>
-<span id="L425" class="LineNr">425 </span>
-<span id="L426" class="LineNr">426 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L427" class="LineNr">427 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
-<span id="L428" class="LineNr">428 </span><span class="Comment">//:</span>
-<span id="L429" class="LineNr">429 </span><span class="Comment">//: Errors will be depth 0.</span>
-<span id="L430" class="LineNr">430 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
-<span id="L431" class="LineNr">431 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
-<span id="L432" class="LineNr">432 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Initial_callstack_depth = <span class="Constant">101</span><span class="Delimiter">;</span>
-<span id="L433" class="LineNr">433 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Max_callstack_depth = <span class="Constant">9989</span><span class="Delimiter">;</span>
-<span id="L434" class="LineNr">434 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
-<span id="L435" class="LineNr">435 </span><span class="Comment">//: (more on that later as well)</span>
-<span id="L436" class="LineNr">436 </span><span class="Comment">//:</span>
-<span id="L437" class="LineNr">437 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
-<span id="L438" class="LineNr">438 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<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="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L173" class="LineNr">173 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span><span class="Normal">int</span> Trace_errors = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
+<span id="L175" class="LineNr">175 </span>
+<span id="L176" class="LineNr">176 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L177" class="LineNr">177 </span><span class="Normal">bool</span> Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print even error trace lines to screen</span>
+<span id="L178" class="LineNr">178 </span><span class="Normal">bool</span> Dump_trace =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines to screen</span>
+<span id="L179" class="LineNr">179 </span>string Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines matching a single label to screen</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L181" class="LineNr">181 </span>Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>Dump_trace =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// toggle this to print traces to screen as they are emitted</span>
+<span id="L183" class="LineNr">183 </span>Dump_label = <span class="Constant">&quot;&quot;</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 Includes&quot;)</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
+<span id="L189" class="LineNr">189 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
+<span id="L190" class="LineNr">190 </span>
+<span id="L191" class="LineNr">191 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
+<span id="L193" class="LineNr">193 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="Comment">// Errors are a special layer.</span>
+<span id="L196" class="LineNr">196 </span><span class="Comment">#define raise  (!Trace_stream ? (scroll_to_bottom_and_close_console(),++Trace_errors,cerr) /*do print*/ : Trace_stream-&gt;stream(Error_depth, &quot;error&quot;))</span>
+<span id="L197" class="LineNr">197 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L198" class="LineNr">198 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L199" class="LineNr">199 </span><span class="Comment">#define assert_for_now assert</span>
+<span id="L200" class="LineNr">200 </span>
+<span id="L201" class="LineNr">201 </span><span class="Comment">//: Automatically close the console in some situations.</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L203" class="LineNr">203 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L205'>scroll_to_bottom_and_close_console</a><span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span><span class="Delimiter">:(code)</span>
+<span id="L205" class="LineNr">205 </span><span class="Normal">void</span> <a href='003trace.cc.html#L205'>scroll_to_bottom_and_close_console</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!tb_is_active<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Comment">// leave the screen in a relatively clean state</span>
+<span id="L208" class="LineNr">208 </span>  tb_set_cursor<span class="Delimiter">(</span>tb_width<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">,</span> tb_height<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>  cout &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\r\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L210" class="LineNr">210 </span>  tb_shutdown<span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">}</span>
+<span id="L212" class="LineNr">212 </span>
+<span id="L213" class="LineNr">213 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
+<span id="L214" class="LineNr">214 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L216" class="LineNr">216 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L220'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L217" class="LineNr">217 </span>  Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L218" class="LineNr">218 </span><span class="Delimiter">}</span>
+<span id="L219" class="LineNr">219 </span><span class="Delimiter">:(code)</span>
+<span id="L220" class="LineNr">220 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L220'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Identifier">return</span> Trace_errors &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="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">:(before &quot;End Types&quot;)</span>
+<span id="L225" class="LineNr">225 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L225'>end</a> <span class="Delimiter">{};</span>
+<span id="L226" class="LineNr">226 </span><span class="Delimiter">:(code)</span>
+<span id="L227" class="LineNr">227 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='003trace.cc.html#L225'>end</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">}</span>
+<span id="L231" class="LineNr">231 </span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L233" class="LineNr">233 </span><span class="Normal">bool</span> Save_trace =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
+<span id="L234" class="LineNr">234 </span>
+<span id="L235" class="LineNr">235 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L236" class="LineNr">236 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L237" class="LineNr">237 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L238" class="LineNr">238 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L239" class="LineNr">239 </span>  <a href='003trace.cc.html#L243'>~lease_tracer</a><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">:(code)</span>
+<span id="L242" class="LineNr">242 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L243" class="LineNr">243 </span>lease_tracer::<a href='003trace.cc.html#L243'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</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">:(before &quot;End Includes&quot;)</span>
+<span id="L248" class="LineNr">248 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L250" class="LineNr">250 </span><a href='003trace.cc.html#L248'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L253" class="LineNr">253 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
+<span id="L254" class="LineNr">254 </span>
+<span id="L255" class="LineNr">255 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L256" class="LineNr">256 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L257" class="LineNr">257 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; <a href='003trace.cc.html#L220'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
+<span id="L258" class="LineNr">258 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span> \
+<span id="L259" class="LineNr">259 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
+<span id="L260" class="LineNr">260 </span>    Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L261" class="LineNr">261 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span> \
+<span id="L262" class="LineNr">262 </span>  <span class="Delimiter">}</span>
+<span id="L263" class="LineNr">263 </span>
+<span id="L264" class="LineNr">264 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Passed &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="L266" class="LineNr">266 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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="L267" class="LineNr">267 </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="L268" class="LineNr">268 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
+<span id="L269" class="LineNr">269 </span>    Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L270" class="LineNr">270 </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="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L274" class="LineNr">274 </span>
+<span id="L275" class="LineNr">275 </span><span class="Delimiter">:(code)</span>
+<span id="L276" class="LineNr">276 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L276'>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="L277" class="LineNr">277 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L279" class="LineNr">279 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L370'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L141'>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="L282" class="LineNr">282 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>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="L284" class="LineNr">284 </span>  string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>  <a href='003trace.cc.html#L308'>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="L286" class="LineNr">286 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </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="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents != <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L290" class="LineNr">290 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L141'>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="L291" class="LineNr">291 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L292" class="LineNr">292 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>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="L293" class="LineNr">293 </span>    <a href='003trace.cc.html#L308'>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="Delimiter">}</span>
+<span id="L295" class="LineNr">295 </span>
+<span id="L296" class="LineNr">296 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L321'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L297" class="LineNr">297 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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;): line [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L189'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Delimiter">}</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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; contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L189'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Delimiter">}</span>
+<span id="L304" class="LineNr">304 </span>  Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Normal">void</span> <a href='003trace.cc.html#L308'>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* contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L309" class="LineNr">309 </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="L310" class="LineNr">310 </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="L311" class="LineNr">311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L312" class="LineNr">312 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>    *contents = <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Delimiter">}</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>    *label = <a href='003trace.cc.html#L394'>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="L317" class="LineNr">317 </span>    *contents = <a href='003trace.cc.html#L394'>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="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span><span class="Delimiter">}</span>
+<span id="L320" class="LineNr">320 </span>
+<span id="L321" class="LineNr">321 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L321'>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; contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L322" class="LineNr">322 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L323" class="LineNr">323 </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="L324" class="LineNr">324 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents == <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Delimiter">}</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Identifier">return</span><span class="Constant"> false</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> <span class="Delimiter">{</span>
+<span id="L330" class="LineNr">330 </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="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> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L336" class="LineNr">336 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L337" class="LineNr">337 </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="L338" class="LineNr">338 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span>
+<span id="L339" class="LineNr">339 </span>        ++result<span class="Delimiter">;</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 class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
+<span id="L344" class="LineNr">344 </span>
+<span id="L345" class="LineNr">345 </span><span class="Normal">int</span> <a href='003trace.cc.html#L345'>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="L346" class="LineNr">346 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L349" class="LineNr">349 </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="L350" class="LineNr">350 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L77'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">),</span> <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L351" class="LineNr">351 </span>        ++result<span class="Delimiter">;</span>
+<span id="L352" class="LineNr">352 </span>    <span class="Delimiter">}</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Delimiter">}</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L355" class="LineNr">355 </span><span class="Delimiter">}</span>
+<span id="L356" class="LineNr">356 </span>
+<span id="L357" class="LineNr">357 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> line<span class="Delimiter">)</span> == <span class="Constant">0</span><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">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L362" class="LineNr">362 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L385'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>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="L364" class="LineNr">364 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or contents in <a href='003trace.cc.html#L189'>trace</a> line</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L365" class="LineNr">365 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Delimiter">}</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Identifier">return</span> trace_doesnt_contain<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 id="L368" class="LineNr">368 </span><span class="Delimiter">}</span>
+<span id="L369" class="LineNr">369 </span>
+<span id="L370" class="LineNr">370 </span>vector&lt;string&gt; <a href='003trace.cc.html#L370'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L371" class="LineNr">371 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L372" class="LineNr">372 </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="L373" class="LineNr">373 </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="L374" class="LineNr">374 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>end</a> == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </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="L376" class="LineNr">376 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>    <span class="Delimiter">}</span>
+<span id="L378" class="LineNr">378 </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="L379" class="LineNr">379 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </span>    <a href='003trace.cc.html#L225'>end</a> = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span>  <span class="Delimiter">}</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Identifier">return</span> result<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>vector&lt;string&gt; <a href='003trace.cc.html#L385'>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="L386" class="LineNr">386 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L387" class="LineNr">387 </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="L388" class="LineNr">388 </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> <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">));</span>
+<span id="L389" class="LineNr">389 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>end</a> != string::npos<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> end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">),</span> string::npos<span class="Delimiter">));</span>
+<span id="L391" class="LineNr">391 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L392" class="LineNr">392 </span><span class="Delimiter">}</span>
+<span id="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span>string <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L395" class="LineNr">395 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L396" class="LineNr">396 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()</span> &amp;&amp; isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span>
+<span id="L397" class="LineNr">397 </span>    ++first<span class="Delimiter">;</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>first == s<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L399" class="LineNr">399 </span>
+<span id="L400" class="LineNr">400 </span>  string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L401" class="LineNr">401 </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="L402" class="LineNr">402 </span>    --last<span class="Delimiter">;</span>
+<span id="L403" class="LineNr">403 </span>  ++last<span class="Delimiter">;</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
+<span id="L405" class="LineNr">405 </span><span class="Delimiter">}</span>
+<span id="L406" class="LineNr">406 </span>
+<span id="L407" class="LineNr">407 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L408" class="LineNr">408 </span><span class="Comment">#include &lt;vector&gt;</span>
+<span id="L409" class="LineNr">409 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L410" class="LineNr">410 </span><span class="Comment">#include &lt;list&gt;</span>
+<span id="L411" class="LineNr">411 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L412" class="LineNr">412 </span><span class="Comment">#include &lt;set&gt;</span>
+<span id="L413" class="LineNr">413 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L414" class="LineNr">414 </span>
+<span id="L415" class="LineNr">415 </span><span class="Comment">#include &lt;sstream&gt;</span>
+<span id="L416" class="LineNr">416 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L417" class="LineNr">417 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Comment">#include &lt;fstream&gt;</span>
+<span id="L420" class="LineNr">420 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L421" class="LineNr">421 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L422" class="LineNr">422 </span>
+<span id="L423" class="LineNr">423 </span><span class="Comment">#include &quot;termbox/termbox.h&quot;</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L426" class="LineNr">426 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment">//:</span>
+<span id="L428" class="LineNr">428 </span><span class="Comment">//: Errors will be depth 0.</span>
+<span id="L429" class="LineNr">429 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
+<span id="L430" class="LineNr">430 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
+<span id="L431" class="LineNr">431 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Initial_callstack_depth = <span class="Constant">101</span><span class="Delimiter">;</span>
+<span id="L432" class="LineNr">432 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Max_callstack_depth = <span class="Constant">9989</span><span class="Delimiter">;</span>
+<span id="L433" class="LineNr">433 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
+<span id="L434" class="LineNr">434 </span><span class="Comment">//: (more on that later as well)</span>
+<span id="L435" class="LineNr">435 </span><span class="Comment">//:</span>
+<span id="L436" class="LineNr">436 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
+<span id="L437" class="LineNr">437 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
 </pre>
 </body>
 </html>
diff --git a/html/003trace.test.cc.html b/html/003trace.test.cc.html
index b6bca603..eccb5493 100644
--- a/html/003trace.test.cc.html
+++ b/html/003trace.test.cc.html
@@ -57,66 +57,66 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L254'>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#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L3" class="LineNr">  3 </span>  <a href='003trace.cc.html#L253'>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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L254'>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#L274'>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#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L9" class="LineNr">  9 </span>  <a href='003trace.cc.html#L253'>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#L273'>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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L254'>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#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L253'>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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L254'>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#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <a href='003trace.cc.html#L253'>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#L190'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L254'>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#L189'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L253'>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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L254'>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#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L253'>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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L254'>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="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L43" class="LineNr"> 43 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L253'>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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><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#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><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#L190'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L189'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>
@@ -131,26 +131,26 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span><span class="Comment">// can't check trace because trace methods call 'split'</span>
 <span id="L74" class="LineNr"> 74 </span>
 <span id="L75" class="LineNr"> 75 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L75'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr"> 76 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L371'>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="L76" class="LineNr"> 76 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L370'>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="L77" class="LineNr"> 77 </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="L78" class="LineNr"> 78 </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="L79" class="LineNr"> 79 </span><span class="Delimiter">}</span>
 <span id="L80" class="LineNr"> 80 </span>
 <span id="L81" class="LineNr"> 81 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L81'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L371'>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="L82" class="LineNr"> 82 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L370'>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="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </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="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="Normal">void</span> <a href='003trace.test.cc.html#L87'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L371'>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="L88" class="LineNr"> 88 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L370'>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="L89" class="LineNr"> 89 </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="L90" class="LineNr"> 90 </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="L91" class="LineNr"> 91 </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="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='003trace.test.cc.html#L94'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L371'>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="L95" class="LineNr"> 95 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L370'>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="L96" class="LineNr"> 96 </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="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </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>
@@ -158,7 +158,7 @@ if ('onhashchange' in window) {
 <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="Normal">void</span> <a href='003trace.test.cc.html#L102'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L371'>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="L103" class="LineNr">103 </span>  vector&lt;string&gt; result = <a href='003trace.cc.html#L370'>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="L104" class="LineNr">104 </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="L105" class="LineNr">105 </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="L106" class="LineNr">106 </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>
@@ -166,19 +166,19 @@ 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="Normal">void</span> <a href='003trace.test.cc.html#L110'>test_trim</a><span class="Delimiter">()</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><a href='003trace.cc.html#L395'>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="L112" class="LineNr">112 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>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="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>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#L395'>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="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>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="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>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#L395'>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="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>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#L395'>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#L395'>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="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L395'>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#L395'>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#L395'>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="L111" class="LineNr">111 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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="L112" class="LineNr">112 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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#L394'>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="L115" class="LineNr">115 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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="L116" class="LineNr">116 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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#L394'>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="L118" class="LineNr">118 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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#L394'>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#L394'>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="L121" class="LineNr">121 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L394'>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#L394'>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#L394'>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="L124" class="LineNr">124 </span><span class="Delimiter">}</span>
 </pre>
 </body>
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index ea8ea5a1..8e674214 100644
--- a/html/010vm.cc.html
+++ b/html/010vm.cc.html
@@ -216,7 +216,7 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span>  <span class="Comment">// End Mu Types Initialization</span>
 <span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
 <span id="L156" class="LineNr">156 </span><span class="Normal">void</span> <a href='010vm.cc.html#L156'>teardown_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</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#L141'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L159" class="LineNr">159 </span>      p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Delimiter">}</span>
@@ -654,7 +654,7 @@ if ('onhashchange' in window) {
 <span id="L592" class="LineNr">592 </span><span class="Delimiter">}</span>
 <span id="L593" class="LineNr">593 </span>
 <span id="L594" class="LineNr">594 </span><span class="Normal">void</span> dump_memory<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L595" class="LineNr">595 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>&gt;::iterator p = Memory<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Memory<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L595" class="LineNr">595 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;<span class="Normal">int</span><span class="Delimiter">,</span> <span class="Normal">double</span>&gt;::iterator p = Memory<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Memory<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L596" class="LineNr">596 </span>    cerr &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L597" class="LineNr">597 </span>  <span class="Delimiter">}</span>
 <span id="L598" class="LineNr">598 </span><span class="Delimiter">}</span>
@@ -884,7 +884,7 @@ if ('onhashchange' in window) {
 <span id="L822" class="LineNr">822 </span><span class="Delimiter">}</span>
 <span id="L823" class="LineNr">823 </span>
 <span id="L824" class="LineNr">824 </span><span class="Normal">int</span> to_integer<span class="Delimiter">(</span>string n<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L825" class="LineNr">825 </span>  <span class="Normal">char</span>* <a href='003trace.cc.html#L226'>end</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L825" class="LineNr">825 </span>  <span class="Normal">char</span>* <a href='003trace.cc.html#L225'>end</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L826" class="LineNr">826 </span>  <span class="Comment">// safe because string.c_str() is guaranteed to be null-terminated</span>
 <span id="L827" class="LineNr">827 </span>  <span class="Normal">int</span> result = strtoll<span class="Delimiter">(</span>n<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> &amp;end<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">any base</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L828" class="LineNr">828 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*end != <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">&quot;tried to convert &quot;</span> &lt;&lt; n &lt;&lt; <span class="Constant">&quot; to number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
diff --git a/html/011load.cc.html b/html/011load.cc.html
index ea3cb614..9319045a 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -106,7 +106,7 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>    <span class="Delimiter">}</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="Comment">// End Command Handlers</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown top-level command: &quot;</span> &lt;&lt; command &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown top-level command: &quot;</span> &lt;&lt; command &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Delimiter">}</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -118,23 +118,23 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr"> 55 </span>  result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr"> 57 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;file ended with 'recipe'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;file ended with 'recipe'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Delimiter">}</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Comment">// End Load Recipe Name</span>
 <span id="L62" class="LineNr"> 62 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// End Recipe Refinements</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;empty result.name</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- defining &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;empty result.name</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- defining &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
 <span id="L68" class="LineNr"> 68 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">,</span> Next_recipe_ordinal<span class="Delimiter">);</span>
 <span id="L69" class="LineNr"> 69 </span>  result<span class="Delimiter">.</span>ordinal = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>  ++Next_recipe_ordinal<span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Recipe<span class="Delimiter">.</span>find<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span> != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;already exists&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Recipe<span class="Delimiter">.</span>find<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span> != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;already exists&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011load.cc.html#L380'>should_check_for_redefine</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
-<span id="L74" class="LineNr"> 74 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;redefining <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;redefining <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>    Recipe<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">}</span>
 <span id="L77" class="LineNr"> 77 </span>  <a href='011load.cc.html#L83'>slurp_body</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> result<span class="Delimiter">);</span>
@@ -147,13 +147,13 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
 <span id="L85" class="LineNr"> 85 </span>  skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: <a href='010vm.cc.html#L19'>recipe</a> body must begin with '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: <a href='010vm.cc.html#L19'>recipe</a> body must begin with '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>  <a href='011load.cc.html#L211'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  <span class="Comment">// permit trailing comment after '['</span>
 <span id="L89" class="LineNr"> 89 </span>  <a href='010vm.cc.html#L33'>instruction</a> curr<span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='011load.cc.html#L98'>next_instruction</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> &amp;curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L91" class="LineNr"> 91 </span>    curr<span class="Delimiter">.</span>original_string = to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="Comment">// End Rewrite Instruction(curr, recipe result)</span>
-<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after rewriting: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after rewriting: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>is_empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
@@ -162,7 +162,7 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>  curr<span class="Delimiter">-&gt;</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>  <a href='011load.cc.html#L211'>skip_whitespace_and_comments</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="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Delimiter">}</span>
 <span id="L105" class="LineNr">105 </span>
@@ -170,13 +170,13 @@ if ('onhashchange' in window) {
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L239'>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> <span class="Delimiter">{</span>
 <span id="L108" class="LineNr">108 </span>    skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L111" class="LineNr">111 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L112" class="LineNr">112 </span>    <span class="Delimiter">}</span>
 <span id="L113" class="LineNr">113 </span>    string word = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L114" class="LineNr">114 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>word<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L115" class="LineNr">115 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L116" class="LineNr">116 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L226'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L116" class="LineNr">116 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L225'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L117" class="LineNr">117 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Delimiter">}</span>
 <span id="L119" class="LineNr">119 </span>    words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">);</span>
@@ -189,39 +189,39 @@ if ('onhashchange' in window) {
 <span id="L126" class="LineNr">126 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>words<span class="Delimiter">)</span> == <span class="Constant">1</span> &amp;&amp; <a href='011load.cc.html#L181'>is_label_word</a><span class="Delimiter">(</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L127" class="LineNr">127 </span>    curr<span class="Delimiter">-&gt;</span>is_label =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L128" class="LineNr">128 </span>    curr<span class="Delimiter">-&gt;</span>label = words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label: &quot;</span> &lt;&lt; curr<span class="Delimiter">-&gt;</span>label &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L129" class="LineNr">129 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label: &quot;</span> &lt;&lt; curr<span class="Delimiter">-&gt;</span>label &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L130" class="LineNr">130 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L226'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> at <a href='003trace.cc.html#L225'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L132" class="LineNr">132 </span>      <span class="Identifier">return</span><span class="Constant"> false</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="Identifier">return</span><span class="Constant"> true</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>  vector&lt;string&gt;::iterator p = words<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>find<span class="Delimiter">(</span>words<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> words<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">)</span> != words<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>find<span class="Delimiter">(</span>words<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> words<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">)</span> != words<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L139" class="LineNr">139 </span>    <span class="Normal">for</span> <span class="Delimiter">(;</span>  *p != <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">;</span>  ++p<span class="Delimiter">)</span>
 <span id="L140" class="LineNr">140 </span>      curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>*p<span class="Delimiter">));</span>
 <span id="L141" class="LineNr">141 </span>    ++p<span class="Delimiter">;</span>  <span class="Comment">// skip &lt;-</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="Normal">if</span> <span class="Delimiter">(</span>p == words<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;instruction prematurely ended with '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p == words<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;instruction prematurely ended with '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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>  curr<span class="Delimiter">-&gt;</span>name = *p<span class="Delimiter">;</span>  ++p<span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Comment">// curr-&gt;operation will be set at transform time</span>
 <span id="L150" class="LineNr">150 </span>
-<span id="L151" class="LineNr">151 </span>  <span class="Normal">for</span> <span class="Delimiter">(;</span>  p != words<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Normal">for</span> <span class="Delimiter">(;</span>  p != words<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L152" class="LineNr">152 </span>    curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>*p<span class="Delimiter">));</span>
 <span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; curr<span class="Delimiter">-&gt;</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L155" class="LineNr">155 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  number of ingredients: &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;reagent&gt;::iterator p = curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L157" class="LineNr">157 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  ingredient: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;reagent&gt;::iterator p = curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L159" class="LineNr">159 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; curr<span class="Delimiter">-&gt;</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L155" class="LineNr">155 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  number of ingredients: &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;reagent&gt;::iterator p = curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != curr<span class="Delimiter">-&gt;</span>ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L157" class="LineNr">157 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  ingredient: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;reagent&gt;::iterator p = curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != curr<span class="Delimiter">-&gt;</span>products<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L159" class="LineNr">159 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>*p<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L161" class="LineNr">161 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;9: unbalanced '[' for <a href='010vm.cc.html#L19'>recipe</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L161" class="LineNr">161 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;9: unbalanced '[' for <a href='010vm.cc.html#L19'>recipe</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L162" class="LineNr">162 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L163" class="LineNr">163 </span>  <span class="Delimiter">}</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Comment">// End next_instruction(curr)</span>
@@ -237,7 +237,7 @@ if ('onhashchange' in window) {
 <span id="L174" class="LineNr">174 </span>  <a href='011load.cc.html#L222'>skip_whitespace_and_comments_but_not_newline</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L175" class="LineNr">175 </span>  string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result != <span class="Constant">&quot;[&quot;</span> &amp;&amp; <a href='011load.cc.html#L186'>ends_with</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Constant">'['</span><span class="Delimiter">))</span>
-<span id="L177" class="LineNr">177 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;insert a space before '[' in '&quot;</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;insert a space before '[' in '&quot;</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L179" class="LineNr">179 </span><span class="Delimiter">}</span>
 <span id="L180" class="LineNr">180 </span>
diff --git a/html/012transform.cc.html b/html/012transform.cc.html
index bf5def13..f6471294 100644
--- a/html/012transform.cc.html
+++ b/html/012transform.cc.html
@@ -102,10 +102,10 @@ if ('onhashchange' in window) {
 <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='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L47" class="LineNr"> 47 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== transform_all()&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== transform_all()&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Comment">// Begin transform_all</span>
 <span id="L49" class="LineNr"> 49 </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#L141'>SIZE</a><span class="Delimiter">(</span>Transform<span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L51" class="LineNr"> 51 </span>      recipe&amp; r = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L52" class="LineNr"> 52 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>transformed_until != t-<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L53" class="LineNr"> 53 </span>      <span class="Comment">// End Transform Checks</span>
@@ -130,8 +130,8 @@ if ('onhashchange' in window) {
 <span id="L72" class="LineNr"> 72 </span>
 <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(code)</span>
 <span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> <a href='012transform.cc.html#L74'>parse_int_reagents</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- parsing any uninitialized reagents as integers&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L75" class="LineNr"> 75 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- parsing any uninitialized reagents as integers&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>    recipe&amp; r = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><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> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/013update_operation.cc.html b/html/013update_operation.cc.html
index 458c52be..a9c93f53 100644
--- a/html/013update_operation.cc.html
+++ b/html/013update_operation.cc.html
@@ -69,14 +69,14 @@ if ('onhashchange' in window) {
 <span id="L6" class="LineNr"> 6 </span>
 <span id="L7" class="LineNr"> 7 </span><span class="Delimiter">:(code)</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Normal">void</span> <a href='013update_operation.cc.html#L8'>update_instruction_operations</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L9" class="LineNr"> 9 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute <a href='010vm.cc.html#L33'>instruction</a> operations for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L9" class="LineNr"> 9 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- compute <a href='010vm.cc.html#L33'>instruction</a> operations for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L10" class="LineNr">10 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L11" class="LineNr">11 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;--- compute instruction operations for recipe &quot; &lt;&lt; caller.name &lt;&lt; '\n';</span>
 <span id="L12" class="LineNr">12 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L13" class="LineNr">13 </span>    instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L14" class="LineNr">14 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L15" class="LineNr">15 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr">16 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has no <a href='010vm.cc.html#L19'>recipe</a> in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr">16 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has no <a href='010vm.cc.html#L19'>recipe</a> in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr">17 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L18" class="LineNr">18 </span>    <span class="Delimiter">}</span>
 <span id="L19" class="LineNr">19 </span>    inst<span class="Delimiter">.</span>operation = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index a4bedd50..394d0437 100644
--- a/html/014literal_string.cc.html
+++ b/html/014literal_string.cc.html
@@ -135,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>brace_depth == <span class="Constant">0</span><span class="Delimiter">)</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 class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; brace_depth &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>    out<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span><span class="Delimiter">}</span>
@@ -162,7 +162,7 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>    out &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">']'</span><span class="Delimiter">)</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>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </span>  out<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L105" class="LineNr">105 </span><span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>
diff --git a/html/015literal_noninteger.cc.html b/html/015literal_noninteger.cc.html
index d38372a1..3ce63b55 100644
--- a/html/015literal_noninteger.cc.html
+++ b/html/015literal_noninteger.cc.html
@@ -82,11 +82,11 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span>  <span class="Identifier">return</span> s<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789-.&quot;</span><span class="Delimiter">)</span> == string::npos  <span class="Comment">// no other characters</span>
 <span id="L21" class="LineNr">21 </span>      &amp;&amp; s<span class="Delimiter">.</span>find_first_of<span class="Delimiter">(</span><span class="Constant">&quot;0123456789&quot;</span><span class="Delimiter">)</span> != string::npos  <span class="Comment">// at least one digit</span>
 <span id="L22" class="LineNr">22 </span>      &amp;&amp; s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'-'</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">)</span> == string::npos  <span class="Comment">// '-' only at first position</span>
-<span id="L23" class="LineNr">23 </span>      &amp;&amp; std::count<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> s<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> <span class="Constant">'.'</span><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// exactly one decimal point</span>
+<span id="L23" class="LineNr">23 </span>      &amp;&amp; std::count<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> s<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> <span class="Constant">'.'</span><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// exactly one decimal point</span>
 <span id="L24" class="LineNr">24 </span><span class="Delimiter">}</span>
 <span id="L25" class="LineNr">25 </span>
 <span id="L26" class="LineNr">26 </span><span class="Normal">double</span> <a href='015literal_noninteger.cc.html#L26'>to_double</a><span class="Delimiter">(</span>string n<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr">27 </span>  <span class="Normal">char</span>* <a href='003trace.cc.html#L226'>end</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Normal">char</span>* <a href='003trace.cc.html#L225'>end</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr">28 </span>  <span class="Comment">// safe because string.c_str() is guaranteed to be null-terminated</span>
 <span id="L29" class="LineNr">29 </span>  <span class="Normal">double</span> result = strtod<span class="Delimiter">(</span>n<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> &amp;end<span class="Delimiter">);</span>
 <span id="L30" class="LineNr">30 </span>  assert<span class="Delimiter">(</span>*end == <span class="cSpecial">'\0'</span><span class="Delimiter">);</span>
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html
index 3ab4e25e..a8ae9068 100644
--- a/html/016dilated_reagent.cc.html
+++ b/html/016dilated_reagent.cc.html
@@ -125,7 +125,7 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'('</span><span class="Delimiter">)</span> open_brackets<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </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="L64" class="LineNr"> 64 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> != <span class="Constant">'('</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L65" class="LineNr"> 65 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced ')'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced ')'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L66" class="LineNr"> 66 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>      <span class="Delimiter">}</span>
 <span id="L68" class="LineNr"> 68 </span>      assert<span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> == <span class="Constant">'('</span><span class="Delimiter">);</span>
@@ -134,7 +134,7 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'['</span><span class="Delimiter">)</span> open_brackets<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
 <span id="L72" class="LineNr"> 72 </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="L73" class="LineNr"> 73 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced ']'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced ']'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>      <span class="Delimiter">}</span>
 <span id="L77" class="LineNr"> 77 </span>      open_brackets<span class="Delimiter">.</span>pop_back<span class="Delimiter">();</span>
@@ -142,7 +142,7 @@ if ('onhashchange' in window) {
 <span id="L79" class="LineNr"> 79 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'{'</span><span class="Delimiter">)</span> open_brackets<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
 <span id="L80" class="LineNr"> 80 </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="L81" class="LineNr"> 81 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>open_brackets<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || open_brackets<span class="Delimiter">.</span>back<span class="Delimiter">()</span> != <span class="Constant">'{'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced '}'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unbalanced '}'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L83" class="LineNr"> 83 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>      <span class="Delimiter">}</span>
 <span id="L85" class="LineNr"> 85 </span>      open_brackets<span class="Delimiter">.</span>pop_back<span class="Delimiter">();</span>
@@ -162,18 +162,18 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>  in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>  <span class="Comment">// skip '{'</span>
 <span id="L100" class="LineNr">100 </span>  name = <a href='016dilated_reagent.cc.html#L139'>slurp_key</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>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid reagent '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' without a name</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid reagent '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' without a name</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Delimiter">}</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">&quot;}&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid empty reagent '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid empty reagent '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">{</span>
 <span id="L110" class="LineNr">110 </span>    string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L111" class="LineNr">111 </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="L112" class="LineNr">112 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L113" class="LineNr">113 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L114" class="LineNr">114 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </span>    <span class="Delimiter">}</span>
 <span id="L116" class="LineNr">116 </span>    string_tree* type_names = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
@@ -188,7 +188,7 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span>    string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </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="L127" class="LineNr">127 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L128" class="LineNr">128 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>    <span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>    string_tree* value = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
@@ -203,7 +203,7 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span>  string result = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L142" class="LineNr">142 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L226'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete dilated reagent at <a href='003trace.cc.html#L225'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L144" class="LineNr">144 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Delimiter">}</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; *result<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span>
diff --git a/html/017parse_tree.cc.html b/html/017parse_tree.cc.html
index 9c1a1763..911ed305 100644
--- a/html/017parse_tree.cc.html
+++ b/html/017parse_tree.cc.html
@@ -111,7 +111,7 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span>    string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </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="L50" class="LineNr"> 50 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L51" class="LineNr"> 51 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete string tree at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete string tree at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L52" class="LineNr"> 52 </span>      <span class="Identifier">return</span> <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L53" class="LineNr"> 53 </span>    <span class="Delimiter">}</span>
 <span id="L54" class="LineNr"> 54 </span>    string_tree* result = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
@@ -132,7 +132,7 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </span>      string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </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="L71" class="LineNr"> 71 </span>        assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L72" class="LineNr"> 72 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete string tree at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete string tree at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L73" class="LineNr"> 73 </span>        <span class="Identifier">return</span> <span class="Constant">NULL</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>*curr<span class="Delimiter">)-&gt;</span>left = <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
diff --git a/html/018constant.cc.html b/html/018constant.cc.html
index 580cf297..2e5661d3 100644
--- a/html/018constant.cc.html
+++ b/html/018constant.cc.html
@@ -78,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr">16 </span><span class="Delimiter">:(before &quot;End Parsing reagent&quot;)</span>
 <span id="L17" class="LineNr">17 </span><span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">&quot;true&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L18" class="LineNr">18 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L19" class="LineNr">19 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'true' is a literal and can't take a type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L19" class="LineNr">19 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'true' is a literal and can't take a type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L20" class="LineNr">20 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L21" class="LineNr">21 </span>  <span class="Delimiter">}</span>
 <span id="L22" class="LineNr">22 </span>  type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal-boolean&quot;</span><span class="Delimiter">);</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr">34 </span><span class="Delimiter">:(before &quot;End Parsing reagent&quot;)</span>
 <span id="L35" class="LineNr">35 </span><span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">&quot;false&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr">37 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'false' is a literal and can't take a type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L37" class="LineNr">37 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'false' is a literal and can't take a type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L38" class="LineNr">38 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Delimiter">}</span>
 <span id="L40" class="LineNr">40 </span>  type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal-boolean&quot;</span><span class="Delimiter">);</span>
@@ -117,7 +117,7 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr">55 </span><span class="Delimiter">:(before &quot;End Parsing reagent&quot;)</span>
 <span id="L56" class="LineNr">56 </span><span class="Normal">if</span> <span class="Delimiter">(</span>name == <span class="Constant">&quot;null&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr">57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L58" class="LineNr">58 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'null' is a literal and can't take a type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr">58 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'null' is a literal and can't take a type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L59" class="LineNr">59 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L60" class="LineNr">60 </span>  <span class="Delimiter">}</span>
 <span id="L61" class="LineNr">61 </span>  type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;literal-address&quot;</span><span class="Delimiter">);</span>
diff --git a/html/019type_abbreviations.cc.html b/html/019type_abbreviations.cc.html
index c2df1ab2..4d9eb542 100644
--- a/html/019type_abbreviations.cc.html
+++ b/html/019type_abbreviations.cc.html
@@ -87,34 +87,34 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span>  string new_type_name = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L24" class="LineNr"> 24 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L239'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> || !new_type_name<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> || new_type_name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement; must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement; must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  string arrow = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L239'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> || !arrow<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>arrow<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L33" class="LineNr"> 33 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>arrow != <span class="Constant">&quot;=&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' statements must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;' but got 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' statements must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;' but got 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; ='</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; ='</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  string old = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>old<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; ='</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' statements must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;' but got 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'type' statement 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; ='</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' statements must be of the form 'type &lt;new type name&gt; = &lt;type expression&gt;' but got 'type &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L48" class="LineNr"> 48 </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#L226'>contains_key</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> new_type_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' conflict: '&quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot;' defined as both '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> new_type_name<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; old &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'type' conflict: '&quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot;' defined as both '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> new_type_name<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; old &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L52" class="LineNr"> 52 </span>  <span class="Delimiter">}</span>
-<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;type&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;alias &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; = &quot;</span> &lt;&lt; old &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;type&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;alias &quot;</span> &lt;&lt; new_type_name &lt;&lt; <span class="Constant">&quot; = &quot;</span> &lt;&lt; old &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L54" class="LineNr"> 54 </span>  type_tree* old_type = <a href='019type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>old<span class="Delimiter">);</span>
 <span id="L55" class="LineNr"> 55 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> new_type_name<span class="Delimiter">,</span> old_type<span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span><span class="Delimiter">}</span>
@@ -171,7 +171,7 @@ if ('onhashchange' in window) {
 <span id="L107" class="LineNr">107 </span>atexit<span class="Delimiter">(</span><a href='019type_abbreviations.cc.html#L117'>clear_type_abbreviations</a><span class="Delimiter">);</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='019type_abbreviations.cc.html#L109'>restore_type_abbreviations</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_tree*&gt;::iterator p = Type_abbreviations<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type_abbreviations<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_tree*&gt;::iterator p = Type_abbreviations<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type_abbreviations<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L111" class="LineNr">111 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type_abbreviations_snapshot<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
 <span id="L112" class="LineNr">112 </span>      <span class="Normal">delete</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Delimiter">}</span>
@@ -179,7 +179,7 @@ if ('onhashchange' in window) {
 <span id="L115" class="LineNr">115 </span>  Type_abbreviations = Type_abbreviations_snapshot<span class="Delimiter">;</span>
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">}</span>
 <span id="L117" class="LineNr">117 </span><span class="Normal">void</span> <a href='019type_abbreviations.cc.html#L117'>clear_type_abbreviations</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_tree*&gt;::iterator p = Type_abbreviations<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type_abbreviations<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_tree*&gt;::iterator p = Type_abbreviations<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type_abbreviations<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L119" class="LineNr">119 </span>    <span class="Normal">delete</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L120" class="LineNr">120 </span>  Type_abbreviations<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L121" class="LineNr">121 </span><span class="Delimiter">}</span>
@@ -232,17 +232,17 @@ if ('onhashchange' in window) {
 <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="Normal">void</span> expand_type_abbreviations<span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L171" class="LineNr">171 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- expand type abbreviations in <a href='010vm.cc.html#L19'>recipe</a> '&quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- expand type abbreviations in <a href='010vm.cc.html#L19'>recipe</a> '&quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L172" class="LineNr">172 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L173" class="LineNr">173 </span>    <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L175" class="LineNr">175 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L176" class="LineNr">176 </span>      expand_type_abbreviations<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient type after expanding abbreviations: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient type after expanding abbreviations: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </span>    <span class="Delimiter">}</span>
 <span id="L179" class="LineNr">179 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L180" class="LineNr">180 </span>      expand_type_abbreviations<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
-<span id="L181" class="LineNr">181 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product type after expanding abbreviations: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L181" class="LineNr">181 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product type after expanding abbreviations: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L182" class="LineNr">182 </span>    <span class="Delimiter">}</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Delimiter">}</span>
 <span id="L184" class="LineNr">184 </span>  <span class="Comment">// End Expand Type Abbreviations(caller)</span>
diff --git a/html/020run.cc.html b/html/020run.cc.html
index 5451e963..c2f8248b 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -128,10 +128,10 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='073scheduler.cc.html#L28'>should_continue_running</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// beware: may modify Current_routine</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Comment">// Running One Instruction</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>is_label<span class="Delimiter">)</span> <span class="Delimiter">{</span> ++current_step_index<span class="Delimiter">();</span>  <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span>Initial_callstack_depth + Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span>Initial_callstack_depth + Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L67" class="LineNr"> 67 </span><span class="CommentedCode">//?     if (Foo) cerr &lt;&lt; &quot;run: &quot; &lt;&lt; to_string(current_instruction()) &lt;&lt; '\n';</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;something wrote to location 0; this should never happen</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;something wrote to location 0; this should never happen</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L70" class="LineNr"> 70 </span>      <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="Delimiter">}</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="Comment">// read all ingredients from memory, each potentially spanning multiple locations</span>
@@ -151,18 +151,18 @@ if ('onhashchange' in window) {
 <span id="L86" class="LineNr"> 86 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L87" class="LineNr"> 87 </span>      <span class="Comment">// Primitive Recipe Implementations</span>
 <span id="L88" class="LineNr"> 88 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L196'>COPY</a>: <span class="Delimiter">{</span>
-<span id="L89" class="LineNr"> 89 </span>        copy<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
+<span id="L89" class="LineNr"> 89 </span>        copy<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<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 class="Comment">// End Primitive Recipe Implementations</span>
 <span id="L93" class="LineNr"> 93 </span>      <span class="Normal">default</span>: <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;not a primitive op: &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>operation &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;not a primitive op: &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>operation &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>      <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="Delimiter">}</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Comment">//: used by a later layer</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>write_products<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L99" class="LineNr"> 99 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: failed to write to all products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L100" class="LineNr">100 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: failed to write to all products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L101" class="LineNr">101 </span>      <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L103" class="LineNr">103 </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#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -211,7 +211,7 @@ if ('onhashchange' in window) {
 <span id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L149" class="LineNr">149 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L150" class="LineNr">150 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == Address_type_ordinal<span class="Delimiter">;</span>
@@ -285,7 +285,7 @@ if ('onhashchange' in window) {
 <span id="L220" class="LineNr">220 </span><span class="CommentedCode">//? cerr &lt;&lt; to_original_string(get(Recipe, get(Recipe_ordinal, &quot;event-loop&quot;))) &lt;&lt; '\n';</span>
 <span id="L221" class="LineNr">221 </span><span class="CommentedCode">//? DUMP(&quot;&quot;);</span>
 <span id="L222" class="LineNr">222 </span><span class="CommentedCode">//? exit(0);</span>
-<span id="L223" class="LineNr">223 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L223" class="LineNr">223 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L220'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L224" class="LineNr">224 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream &amp;&amp; Run_tests<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Comment">// We'll want a trace per test. Clear the trace.</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Normal">delete</span> Trace_stream<span class="Delimiter">;</span>
@@ -299,7 +299,7 @@ if ('onhashchange' in window) {
 <span id="L234" class="LineNr">234 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!Run_tests &amp;&amp; <a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> &amp;&amp; <a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Comment">// Running Main</span>
 <span id="L236" class="LineNr">236 </span>  <a href='000organization.cc.html#L134'>reset</a><span class="Delimiter">();</span>
-<span id="L237" class="LineNr">237 </span>  <a href='003trace.cc.html#L190'>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; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L237" class="LineNr">237 </span>  <a href='003trace.cc.html#L189'>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; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L238" class="LineNr">238 </span>  assert<span class="Delimiter">(</span>Num_calls_to_transform_all == <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L239" class="LineNr">239 </span>  <a href='073scheduler.cc.html#L122'>run_main</a><span class="Delimiter">(</span>argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
 <span id="L240" class="LineNr">240 </span><span class="Delimiter">}</span>
@@ -317,10 +317,10 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span>  <span class="Delimiter">}</span>
 <span id="L253" class="LineNr">253 </span>  ifstream fin<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L254" class="LineNr">254 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L255" class="LineNr">255 </span>    cerr &lt;&lt; <span class="Constant">&quot;no such file '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  <span class="Comment">// don't raise, just warn. just in case it's just a name for a scenario to run.</span>
+<span id="L255" class="LineNr">255 </span>    cerr &lt;&lt; <span class="Constant">&quot;no such file '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  <span class="Comment">// don't raise, just warn. just in case it's just a name for a scenario to run.</span>
 <span id="L256" class="LineNr">256 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L257" class="LineNr">257 </span>  <span class="Delimiter">}</span>
-<span id="L258" class="LineNr">258 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== &quot;</span> &lt;&lt; filename &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L258" class="LineNr">258 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;=== &quot;</span> &lt;&lt; filename &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L259" class="LineNr">259 </span>  load<span class="Delimiter">(</span>fin<span class="Delimiter">);</span>
 <span id="L260" class="LineNr">260 </span>  fin<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
 <span id="L261" class="LineNr">261 </span><span class="Delimiter">}</span>
@@ -371,7 +371,7 @@ if ('onhashchange' in window) {
 <span id="L306" class="LineNr">306 </span>  <span class="Normal">int</span> size = size_of<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>  offset &lt; size<span class="Delimiter">;</span>  ++offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L308" class="LineNr">308 </span>    <span class="Normal">double</span> val = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value+offset<span class="Delimiter">);</span>
-<span id="L309" class="LineNr">309 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L309" class="LineNr">309 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L310" class="LineNr">310 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>val<span class="Delimiter">);</span>
 <span id="L311" class="LineNr">311 </span>  <span class="Delimiter">}</span>
 <span id="L312" class="LineNr">312 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -381,24 +381,24 @@ if ('onhashchange' in window) {
 <span id="L316" class="LineNr">316 </span>  assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>  <span class="Comment">// run-time only</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Comment">// Begin Preprocess write_memory(x, data)</span>
 <span id="L318" class="LineNr">318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'; no type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'; no type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L320" class="LineNr">320 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L324" class="LineNr">324 </span>  <span class="Comment">// End Preprocess write_memory(x, data)</span>
 <span id="L325" class="LineNr">325 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L326" class="LineNr">326 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L326" class="LineNr">326 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't write to location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L327" class="LineNr">327 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L328" class="LineNr">328 </span>  <span class="Delimiter">}</span>
 <span id="L329" class="LineNr">329 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size_mismatch<span class="Delimiter">(</span>x<span class="Delimiter">,</span> data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L330" class="LineNr">330 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;size mismatch in storing to '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L330" class="LineNr">330 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;size mismatch in storing to '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; size_of<span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L331" class="LineNr">331 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L332" class="LineNr">332 </span>  <span class="Delimiter">}</span>
 <span id="L333" class="LineNr">333 </span>  <span class="Comment">// End write_memory(x) Special-cases</span>
 <span id="L334" class="LineNr">334 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> offset = <span class="Constant">0</span><span class="Delimiter">;</span>  offset &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">);</span>  ++offset<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L335" class="LineNr">335 </span>    assert<span class="Delimiter">(</span>x<span class="Delimiter">.</span>value+offset &gt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>value+offset &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L337" class="LineNr">337 </span><span class="CommentedCode">//?     if (Foo) cerr &lt;&lt; &quot;mem: storing &quot; &lt;&lt; no_scientific(data.at(offset)) &lt;&lt; &quot; in location &quot; &lt;&lt; x.value+offset &lt;&lt; '\n';</span>
 <span id="L338" class="LineNr">338 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value+offset<span class="Delimiter">,</span> data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>offset<span class="Delimiter">));</span>
 <span id="L339" class="LineNr">339 </span>  <span class="Delimiter">}</span>
@@ -419,7 +419,7 @@ if ('onhashchange' in window) {
 <span id="L354" class="LineNr">354 </span>  <span class="Delimiter">}</span>
 <span id="L355" class="LineNr">355 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L356" class="LineNr">356 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L357" class="LineNr">357 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L357" class="LineNr">357 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L358" class="LineNr">358 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><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">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == Address_type_ordinal<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>  <span class="Comment">// address and alloc id</span>
@@ -457,7 +457,7 @@ if ('onhashchange' in window) {
 <span id="L392" class="LineNr">392 </span>  vector&lt;recipe_ordinal&gt; tmp = load<span class="Delimiter">(</span>form<span class="Delimiter">);</span>
 <span id="L393" class="LineNr">393 </span>  <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
 <span id="L394" class="LineNr">394 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L220'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L396" class="LineNr">396 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace &amp;&amp; Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
 <span id="L397" class="LineNr">397 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L398" class="LineNr">398 </span>  <span class="Delimiter">}</span>
@@ -554,7 +554,7 @@ if ('onhashchange' in window) {
 <span id="L489" class="LineNr">489 </span>  ofstream fout<span class="Delimiter">;</span>
 <span id="L490" class="LineNr">490 </span>  fout<span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;profile.instructions&quot;</span><span class="Delimiter">);</span>
 <span id="L491" class="LineNr">491 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fout<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L492" class="LineNr">492 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Instructions_running<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Instructions_running<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L492" class="LineNr">492 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Instructions_running<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Instructions_running<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L493" class="LineNr">493 </span>      fout &lt;&lt; std::setw<span class="Delimiter">(</span><span class="Constant">9</span><span class="Delimiter">)</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>second &lt;&lt; <span class="Constant">' '</span> &lt;&lt; header_label<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L494" class="LineNr">494 </span>    <span class="Delimiter">}</span>
 <span id="L495" class="LineNr">495 </span>  <span class="Delimiter">}</span>
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index 74c47cc7..7d82f1f2 100644
--- a/html/021check_instruction.cc.html
+++ b/html/021check_instruction.cc.html
@@ -75,7 +75,7 @@ if ('onhashchange' in window) {
 <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> <a href='021check_instruction.cc.html#L15'>check_instruction</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- perform checks for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- perform checks for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>  map&lt;string<span class="Delimiter">,</span> vector&lt;type_ordinal&gt; &gt; metadata<span class="Delimiter">;</span>
 <span id="L18" class="LineNr"> 18 </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#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L19" class="LineNr"> 19 </span>    instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
@@ -84,12 +84,12 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span>      <span class="Comment">// Primitive Recipe Checks</span>
 <span id="L23" class="LineNr"> 23 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L196'>COPY</a>: <span class="Delimiter">{</span>
 <span id="L24" class="LineNr"> 24 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L25" class="LineNr"> 25 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr"> 25 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L29" class="LineNr"> 29 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't copy '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' to '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'; types don't match</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L30" class="LineNr"> 30 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't copy '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' to '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'; types don't match</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L31" class="LineNr"> 31 </span>            <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L32" class="LineNr"> 32 </span>          <span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>        <span class="Delimiter">}</span>
@@ -252,7 +252,7 @@ if ('onhashchange' in window) {
 <span id="L190" class="LineNr">190 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L191" class="LineNr">191 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L192" class="LineNr">192 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L193" class="LineNr">193 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L193" class="LineNr">193 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L194" class="LineNr">194 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L195" class="LineNr">195 </span>  <span class="Delimiter">}</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Identifier">return</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == Array_type_ordinal<span class="Delimiter">;</span>
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index 6f3751ba..0b49bc79 100644
--- a/html/022arithmetic.cc.html
+++ b/html/022arithmetic.cc.html
@@ -71,16 +71,16 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr">  9 </span>  <span class="Comment">// primary goal of these checks is to forbid address arithmetic</span>
 <span id="L10" class="LineNr"> 10 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L11" class="LineNr"> 11 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L12" class="LineNr"> 12 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'add' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L12" class="LineNr"> 12 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'add' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L13" class="LineNr"> 13 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L14" class="LineNr"> 14 </span>    <span class="Delimiter">}</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Delimiter">}</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L17" class="LineNr"> 17 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'add' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L17" class="LineNr"> 17 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'add' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L18" class="LineNr"> 18 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Delimiter">}</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'add' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'add' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -137,21 +137,21 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L76" class="LineNr"> 76 </span><span class="Normal">case</span> SUBTRACT: <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' has no ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' has no ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L79" class="LineNr"> 79 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">}</span>
 <span id="L81" class="LineNr"> 81 </span>  <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L83" class="LineNr"> 83 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L84" class="LineNr"> 84 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">}</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'subtract' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L93" class="LineNr"> 93 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -194,16 +194,16 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span><span class="Normal">case</span> MULTIPLY: <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L134" class="LineNr">134 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'multiply' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'multiply' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>    <span class="Delimiter">}</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Delimiter">}</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'multiply' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'multiply' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'multiply' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'multiply' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L145" class="LineNr">145 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -246,21 +246,21 @@ if ('onhashchange' in window) {
 <span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L185" class="LineNr">185 </span><span class="Normal">case</span> DIVIDE: <span class="Delimiter">{</span>
 <span id="L186" class="LineNr">186 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L187" class="LineNr">187 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' has no ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' has no ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L191" class="LineNr">191 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L192" class="LineNr">192 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L192" class="LineNr">192 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' requires number ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L193" class="LineNr">193 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</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 class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L197" class="LineNr">197 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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="Delimiter">}</span>
 <span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L201" class="LineNr">201 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L201" class="LineNr">201 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L202" class="LineNr">202 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L203" class="LineNr">203 </span>  <span class="Delimiter">}</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -304,20 +304,20 @@ if ('onhashchange' in window) {
 <span id="L242" class="LineNr">242 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L243" class="LineNr">243 </span><span class="Normal">case</span> DIVIDE_WITH_REMAINDER: <span class="Delimiter">{</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L245" class="LineNr">245 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L246" class="LineNr">246 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Delimiter">}</span>
 <span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L249" class="LineNr">249 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L249" class="LineNr">249 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' yields two products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' yields two products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L254" class="LineNr">254 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
 <span id="L256" class="LineNr">256 </span>  <span class="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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L257" class="LineNr">257 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L258" class="LineNr">258 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L258" class="LineNr">258 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'divide-with-remainder' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L259" class="LineNr">259 </span>      <span class="Identifier">goto</span> finish_checking_instruction<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>
@@ -330,7 +330,7 @@ if ('onhashchange' in window) {
 <span id="L268" class="LineNr">268 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> a = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> b = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L270" class="LineNr">270 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>b == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L271" class="LineNr">271 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;divide by zero in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;divide by zero in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L272" class="LineNr">272 </span>    products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L273" class="LineNr">273 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L274" class="LineNr">274 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -388,19 +388,19 @@ if ('onhashchange' in window) {
 <span id="L326" class="LineNr">326 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L327" class="LineNr">327 </span><span class="Normal">case</span> SHIFT_LEFT: <span class="Delimiter">{</span>
 <span id="L328" class="LineNr">328 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L329" class="LineNr">329 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L330" class="LineNr">330 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L331" class="LineNr">331 </span>  <span class="Delimiter">}</span>
 <span id="L332" class="LineNr">332 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L333" class="LineNr">333 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L333" class="LineNr">333 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L334" class="LineNr">334 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Delimiter">}</span>
 <span id="L336" class="LineNr">336 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L337" class="LineNr">337 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L337" class="LineNr">337 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L338" class="LineNr">338 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L339" class="LineNr">339 </span>  <span class="Delimiter">}</span>
 <span id="L340" class="LineNr">340 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L341" class="LineNr">341 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-left' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L342" class="LineNr">342 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L343" class="LineNr">343 </span>  <span class="Delimiter">}</span>
 <span id="L344" class="LineNr">344 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -412,7 +412,7 @@ if ('onhashchange' in window) {
 <span id="L350" class="LineNr">350 </span>  <span class="Normal">int</span> b = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L351" class="LineNr">351 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L352" class="LineNr">352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>b &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L353" class="LineNr">353 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L353" class="LineNr">353 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L354" class="LineNr">354 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</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="Delimiter">}</span>
@@ -459,19 +459,19 @@ if ('onhashchange' in window) {
 <span id="L397" class="LineNr">397 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L398" class="LineNr">398 </span><span class="Normal">case</span> SHIFT_RIGHT: <span class="Delimiter">{</span>
 <span id="L399" class="LineNr">399 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L400" class="LineNr">400 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L400" class="LineNr">400 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L401" class="LineNr">401 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L402" class="LineNr">402 </span>  <span class="Delimiter">}</span>
 <span id="L403" class="LineNr">403 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L404" class="LineNr">404 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L404" class="LineNr">404 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L405" class="LineNr">405 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L406" class="LineNr">406 </span>  <span class="Delimiter">}</span>
 <span id="L407" class="LineNr">407 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L408" class="LineNr">408 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L409" class="LineNr">409 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L410" class="LineNr">410 </span>  <span class="Delimiter">}</span>
 <span id="L411" class="LineNr">411 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L412" class="LineNr">412 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L412" class="LineNr">412 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'shift-right' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L413" class="LineNr">413 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L414" class="LineNr">414 </span>  <span class="Delimiter">}</span>
 <span id="L415" class="LineNr">415 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -483,7 +483,7 @@ if ('onhashchange' in window) {
 <span id="L421" class="LineNr">421 </span>  <span class="Normal">int</span> b = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L422" class="LineNr">422 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L423" class="LineNr">423 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>b &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L424" class="LineNr">424 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L424" class="LineNr">424 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;second ingredient can't be negative in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L425" class="LineNr">425 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L426" class="LineNr">426 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L427" class="LineNr">427 </span>  <span class="Delimiter">}</span>
@@ -530,19 +530,19 @@ if ('onhashchange' in window) {
 <span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L469" class="LineNr">469 </span><span class="Normal">case</span> AND_BITS: <span class="Delimiter">{</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L471" class="LineNr">471 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L471" class="LineNr">471 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L472" class="LineNr">472 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L473" class="LineNr">473 </span>  <span class="Delimiter">}</span>
 <span id="L474" class="LineNr">474 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L475" class="LineNr">475 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L475" class="LineNr">475 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L476" class="LineNr">476 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L477" class="LineNr">477 </span>  <span class="Delimiter">}</span>
 <span id="L478" class="LineNr">478 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L479" class="LineNr">479 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L479" class="LineNr">479 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L480" class="LineNr">480 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L481" class="LineNr">481 </span>  <span class="Delimiter">}</span>
 <span id="L482" class="LineNr">482 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L483" class="LineNr">483 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L483" class="LineNr">483 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L484" class="LineNr">484 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L485" class="LineNr">485 </span>  <span class="Delimiter">}</span>
 <span id="L486" class="LineNr">486 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -588,19 +588,19 @@ if ('onhashchange' in window) {
 <span id="L526" class="LineNr">526 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L527" class="LineNr">527 </span><span class="Normal">case</span> OR_BITS: <span class="Delimiter">{</span>
 <span id="L528" class="LineNr">528 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L529" class="LineNr">529 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L529" class="LineNr">529 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L530" class="LineNr">530 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L531" class="LineNr">531 </span>  <span class="Delimiter">}</span>
 <span id="L532" class="LineNr">532 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L533" class="LineNr">533 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L533" class="LineNr">533 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L534" class="LineNr">534 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L535" class="LineNr">535 </span>  <span class="Delimiter">}</span>
 <span id="L536" class="LineNr">536 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L537" class="LineNr">537 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L537" class="LineNr">537 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L541" class="LineNr">541 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L541" class="LineNr">541 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L542" class="LineNr">542 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L543" class="LineNr">543 </span>  <span class="Delimiter">}</span>
 <span id="L544" class="LineNr">544 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -640,19 +640,19 @@ if ('onhashchange' in window) {
 <span id="L578" class="LineNr">578 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L579" class="LineNr">579 </span><span class="Normal">case</span> XOR_BITS: <span class="Delimiter">{</span>
 <span id="L580" class="LineNr">580 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L581" class="LineNr">581 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L581" class="LineNr">581 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L582" class="LineNr">582 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L583" class="LineNr">583 </span>  <span class="Delimiter">}</span>
 <span id="L584" class="LineNr">584 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> || !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L585" class="LineNr">585 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L585" class="LineNr">585 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' requires number ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L586" class="LineNr">586 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L587" class="LineNr">587 </span>  <span class="Delimiter">}</span>
 <span id="L588" class="LineNr">588 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L589" class="LineNr">589 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L589" class="LineNr">589 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L590" class="LineNr">590 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L591" class="LineNr">591 </span>  <span class="Delimiter">}</span>
 <span id="L592" class="LineNr">592 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L593" class="LineNr">593 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L593" class="LineNr">593 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'xor-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L594" class="LineNr">594 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L595" class="LineNr">595 </span>  <span class="Delimiter">}</span>
 <span id="L596" class="LineNr">596 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -692,19 +692,19 @@ if ('onhashchange' in window) {
 <span id="L630" class="LineNr">630 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L631" class="LineNr">631 </span><span class="Normal">case</span> FLIP_BITS: <span class="Delimiter">{</span>
 <span id="L632" class="LineNr">632 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L633" class="LineNr">633 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L633" class="LineNr">633 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L634" class="LineNr">634 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L635" class="LineNr">635 </span>  <span class="Delimiter">}</span>
 <span id="L636" class="LineNr">636 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L637" class="LineNr">637 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' requires a number ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L637" class="LineNr">637 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' requires a number ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L638" class="LineNr">638 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L639" class="LineNr">639 </span>  <span class="Delimiter">}</span>
 <span id="L640" class="LineNr">640 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L641" class="LineNr">641 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L641" class="LineNr">641 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' yields one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L642" class="LineNr">642 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L643" class="LineNr">643 </span>  <span class="Delimiter">}</span>
 <span id="L644" class="LineNr">644 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L645" class="LineNr">645 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L645" class="LineNr">645 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'flip-bits' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L646" class="LineNr">646 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L647" class="LineNr">647 </span>  <span class="Delimiter">}</span>
 <span id="L648" class="LineNr">648 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -749,11 +749,11 @@ if ('onhashchange' in window) {
 <span id="L687" class="LineNr">687 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L688" class="LineNr">688 </span><span class="Normal">case</span> ROUND: <span class="Delimiter">{</span>
 <span id="L689" class="LineNr">689 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L690" class="LineNr">690 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'round' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L690" class="LineNr">690 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'round' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L691" class="LineNr">691 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L692" class="LineNr">692 </span>  <span class="Delimiter">}</span>
 <span id="L693" class="LineNr">693 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L694" class="LineNr">694 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'round' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L694" class="LineNr">694 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'round' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L695" class="LineNr">695 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L696" class="LineNr">696 </span>  <span class="Delimiter">}</span>
 <span id="L697" class="LineNr">697 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -790,11 +790,11 @@ if ('onhashchange' in window) {
 <span id="L728" class="LineNr">728 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L729" class="LineNr">729 </span><span class="Normal">case</span> TRUNCATE: <span class="Delimiter">{</span>
 <span id="L730" class="LineNr">730 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L731" class="LineNr">731 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'truncate' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L731" class="LineNr">731 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'truncate' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L732" class="LineNr">732 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L733" class="LineNr">733 </span>  <span class="Delimiter">}</span>
 <span id="L734" class="LineNr">734 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L735" class="LineNr">735 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'truncate' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L735" class="LineNr">735 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'truncate' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L736" class="LineNr">736 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L737" class="LineNr">737 </span>  <span class="Delimiter">}</span>
 <span id="L738" class="LineNr">738 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -825,11 +825,11 @@ if ('onhashchange' in window) {
 <span id="L763" class="LineNr">763 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L764" class="LineNr">764 </span><span class="Normal">case</span> SQUARE_ROOT: <span class="Delimiter">{</span>
 <span id="L765" class="LineNr">765 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L766" class="LineNr">766 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'square-root' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L766" class="LineNr">766 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'square-root' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L767" class="LineNr">767 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L768" class="LineNr">768 </span>  <span class="Delimiter">}</span>
 <span id="L769" class="LineNr">769 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L770" class="LineNr">770 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'square-root' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L770" class="LineNr">770 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'square-root' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L771" class="LineNr">771 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L772" class="LineNr">772 </span>  <span class="Delimiter">}</span>
 <span id="L773" class="LineNr">773 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -848,19 +848,19 @@ if ('onhashchange' in window) {
 <span id="L786" class="LineNr">786 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L787" class="LineNr">787 </span><span class="Normal">case</span> CHARACTER_TO_CODE: <span class="Delimiter">{</span>
 <span id="L788" class="LineNr">788 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L789" class="LineNr">789 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'character-to-code' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L789" class="LineNr">789 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'character-to-code' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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">if</span> <span class="Delimiter">(</span>!is_mu_character<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L793" class="LineNr">793 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'character-to-code' should be a character, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L793" class="LineNr">793 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'character-to-code' should be a character, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L794" class="LineNr">794 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L795" class="LineNr">795 </span>  <span class="Delimiter">}</span>
 <span id="L796" class="LineNr">796 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L797" class="LineNr">797 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'character-to-code' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L797" class="LineNr">797 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'character-to-code' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L801" class="LineNr">801 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of 'character-to-code' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L801" class="LineNr">801 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of 'character-to-code' should be a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L802" class="LineNr">802 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L803" class="LineNr">803 </span>  <span class="Delimiter">}</span>
 <span id="L804" class="LineNr">804 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/023boolean.cc.html b/html/023boolean.cc.html
index 8acc8772..bda78f0c 100644
--- a/html/023boolean.cc.html
+++ b/html/023boolean.cc.html
@@ -70,16 +70,16 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr">  8 </span><span class="Normal">case</span> AND: <span class="Delimiter">{</span>
 <span id="L9" class="LineNr">  9 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L10" class="LineNr"> 10 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_scalar<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L11" class="LineNr"> 11 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' requires boolean ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L11" class="LineNr"> 11 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' requires boolean ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L12" class="LineNr"> 12 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L13" class="LineNr"> 13 </span>    <span class="Delimiter">}</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Delimiter">}</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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">}</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -134,16 +134,16 @@ if ('onhashchange' in window) {
 <span id="L72" class="LineNr"> 72 </span><span class="Normal">case</span> OR: <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="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_scalar<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' requires boolean ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L75" class="LineNr"> 75 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'and' requires boolean ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L76" class="LineNr"> 76 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Delimiter">}</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'or' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -191,19 +191,19 @@ if ('onhashchange' in window) {
 <span id="L129" class="LineNr">129 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L130" class="LineNr">130 </span><span class="Normal">case</span> NOT: <span class="Delimiter">{</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;ingredients and products should match in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;ingredients and products should match in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L133" class="LineNr">133 </span>    <span class="Identifier">break</span><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">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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L136" class="LineNr">136 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_scalar<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &amp;&amp; !is_mu_address<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L137" class="LineNr">137 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' requires ingredients that can be interpreted as boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' requires ingredients that can be interpreted as boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L138" class="LineNr">138 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</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 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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L142" class="LineNr">142 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L143" class="LineNr">143 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'not' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L145" class="LineNr">145 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L146" class="LineNr">146 </span>    <span class="Delimiter">}</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Delimiter">}</span>
diff --git a/html/024jump.cc.html b/html/024jump.cc.html
index a1ea6ae8..ad24795d 100644
--- a/html/024jump.cc.html
+++ b/html/024jump.cc.html
@@ -79,15 +79,15 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Normal">case</span> JUMP: <span class="Delimiter">{</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L19" class="LineNr"> 19 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should get exactly one ingredient</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should get exactly one ingredient</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L20" class="LineNr"> 20 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Delimiter">}</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should be a label or offset, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should be a label or offset, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'jump' instructions write no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'jump' instructions write no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L33" class="LineNr"> 33 </span><span class="Normal">case</span> JUMP: <span class="Delimiter">{</span>
 <span id="L34" class="LineNr"> 34 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
 <span id="L35" class="LineNr"> 35 </span>  <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L33'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L33'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Comment">// skip rest of this instruction</span>
 <span id="L38" class="LineNr"> 38 </span>  write_products =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L39" class="LineNr"> 39 </span>  fall_through_to_next_instruction =<span class="Constant"> false</span><span class="Delimiter">;</span>
@@ -132,19 +132,19 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L70" class="LineNr"> 70 </span><span class="Normal">case</span> JUMP_IF: <span class="Delimiter">{</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should get exactly two ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should get exactly two ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_scalar<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a boolean for its first ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a boolean for its first ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a label or offset for its second ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a label or offset for its second ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Delimiter">}</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'jump-if' instructions write no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'jump-if' instructions write no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Comment">// End JUMP_IF Checks</span>
@@ -154,11 +154,11 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span><span class="Normal">case</span> JUMP_IF: <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar_ingredient<span class="Delimiter">(</span>ingredients<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump-if fell through&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump-if fell through&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Delimiter">}</span>
 <span id="L97" class="LineNr"> 97 </span>  <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L33'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L33'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Comment">// skip rest of this instruction</span>
 <span id="L100" class="LineNr">100 </span>  write_products =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>  fall_through_to_next_instruction =<span class="Constant"> false</span><span class="Delimiter">;</span>
@@ -203,19 +203,19 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L141" class="LineNr">141 </span><span class="Normal">case</span> JUMP_UNLESS: <span class="Delimiter">{</span>
 <span id="L142" class="LineNr">142 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should get exactly two ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L143" class="LineNr">143 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should get exactly two ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L144" class="LineNr">144 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Delimiter">}</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_scalar<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a boolean for its first ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L147" class="LineNr">147 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a boolean for its first ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L148" class="LineNr">148 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a label or offset for its second ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires a label or offset for its second ingredient, but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L153" class="LineNr">153 </span>  <span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'jump' instructions write no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L155" class="LineNr">155 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'jump' instructions write no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 JUMP_UNLESS Checks</span>
@@ -225,11 +225,11 @@ if ('onhashchange' in window) {
 <span id="L162" class="LineNr">162 </span><span class="Normal">case</span> JUMP_UNLESS: <span class="Delimiter">{</span>
 <span id="L163" class="LineNr">163 </span>  assert<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>initialized<span class="Delimiter">);</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='023boolean.cc.html#L35'>scalar_ingredient</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump-unless fell through&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump-unless fell through&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L166" class="LineNr">166 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Delimiter">}</span>
 <span id="L168" class="LineNr">168 </span>  <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> += ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>+<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L169" class="LineNr">169 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L33'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L169" class="LineNr">169 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to <a href='010vm.cc.html#L33'>instruction</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Comment">// skip rest of this instruction</span>
 <span id="L171" class="LineNr">171 </span>  write_products =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L172" class="LineNr">172 </span>  fall_through_to_next_instruction =<span class="Constant"> false</span><span class="Delimiter">;</span>
diff --git a/html/025compare.cc.html b/html/025compare.cc.html
index b4940bb8..ad8faf47 100644
--- a/html/025compare.cc.html
+++ b/html/025compare.cc.html
@@ -69,22 +69,22 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr">  7 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L8" class="LineNr">  8 </span><span class="Normal">case</span> EQUAL: <span class="Delimiter">{</span>
 <span id="L9" class="LineNr">  9 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L10" class="LineNr"> 10 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L11" class="LineNr"> 11 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L12" class="LineNr"> 12 </span>  <span class="Delimiter">}</span>
 <span id="L13" class="LineNr"> 13 </span>  <span class="Normal">const</span> reagent&amp; exemplar = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip exemplar</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L15" class="LineNr"> 15 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">)</span> &amp;&amp; !types_match<span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' expects ingredients to be all of the same type, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' expects ingredients to be all of the same type, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>      <span class="Identifier">goto</span> finish_checking_instruction<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>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L25" class="LineNr"> 25 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr"> 25 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -98,7 +98,7 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span>      result =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L37" class="LineNr"> 37 </span>      <span class="Identifier">break</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>!equal<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> exemplar<span class="Delimiter">.</span>begin<span class="Delimiter">()))</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!equal<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> exemplar<span class="Delimiter">.</span>begin<span class="Delimiter">()))</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr"> 40 </span>      result =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>    <span class="Delimiter">}</span>
@@ -147,20 +147,20 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Normal">case</span> NOT_EQUAL: <span class="Delimiter">{</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' needs two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' needs two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">const</span> reagent&amp; exemplar = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> exemplar<span class="Delimiter">)</span> &amp;&amp; !types_match<span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' expects ingredients to be all of the same type, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' expects ingredients to be all of the same type, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L97" class="LineNr"> 97 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Delimiter">}</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L101" class="LineNr">101 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L101" class="LineNr">101 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -173,7 +173,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Delimiter">}</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">bool</span> equal_ingredients = equal<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> exemplar<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">bool</span> equal_ingredients = equal<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> exemplar<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
 <span id="L115" class="LineNr">115 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>!equal_ingredients<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>
@@ -205,21 +205,21 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L144" class="LineNr">144 </span><span class="Normal">case</span> GREATER_THAN: <span class="Delimiter">{</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L146" class="LineNr">146 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L147" class="LineNr">147 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Delimiter">}</span>
 <span id="L149" class="LineNr">149 </span>  <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L150" class="LineNr">150 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L151" class="LineNr">151 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L152" class="LineNr">152 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L153" class="LineNr">153 </span>    <span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>  <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L156" class="LineNr">156 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L157" class="LineNr">157 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L160" class="LineNr">160 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-than' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L161" class="LineNr">161 </span>    <span class="Identifier">break</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>
@@ -272,21 +272,21 @@ if ('onhashchange' in window) {
 <span id="L210" class="LineNr">210 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L211" class="LineNr">211 </span><span class="Normal">case</span> LESSER_THAN: <span class="Delimiter">{</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L213" class="LineNr">213 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L214" class="LineNr">214 </span>    <span class="Identifier">break</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">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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L217" class="LineNr">217 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L218" class="LineNr">218 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L219" class="LineNr">219 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L220" class="LineNr">220 </span>    <span class="Delimiter">}</span>
 <span id="L221" class="LineNr">221 </span>  <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L223" class="LineNr">223 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L223" class="LineNr">223 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-than' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -339,21 +339,21 @@ if ('onhashchange' in window) {
 <span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L278" class="LineNr">278 </span><span class="Normal">case</span> GREATER_OR_EQUAL: <span class="Delimiter">{</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L280" class="LineNr">280 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L280" class="LineNr">280 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L281" class="LineNr">281 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L282" class="LineNr">282 </span>  <span class="Delimiter">}</span>
 <span id="L283" class="LineNr">283 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<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_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr">285 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L285" class="LineNr">285 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L286" class="LineNr">286 </span>      <span class="Identifier">goto</span> finish_checking_instruction<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="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr">290 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L290" class="LineNr">290 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L291" class="LineNr">291 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L292" class="LineNr">292 </span>  <span class="Delimiter">}</span>
 <span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L295" class="LineNr">295 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
 <span id="L297" class="LineNr">297 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -414,21 +414,21 @@ if ('onhashchange' in window) {
 <span id="L352" class="LineNr">352 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L353" class="LineNr">353 </span><span class="Normal">case</span> LESSER_OR_EQUAL: <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-or-equal' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L355" class="LineNr">355 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-or-equal' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L356" class="LineNr">356 </span>    <span class="Identifier">break</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="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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L359" class="LineNr">359 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L360" class="LineNr">360 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-or-equal' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L360" class="LineNr">360 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'lesser-or-equal' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L361" class="LineNr">361 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</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 class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L365" class="LineNr">365 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L365" class="LineNr">365 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L366" class="LineNr">366 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
 <span id="L368" class="LineNr">368 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L369" class="LineNr">369 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L369" class="LineNr">369 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'greater-or-equal' should yield a boolean, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L370" class="LineNr">370 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L371" class="LineNr">371 </span>  <span class="Delimiter">}</span>
 <span id="L372" class="LineNr">372 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -489,21 +489,21 @@ if ('onhashchange' in window) {
 <span id="L427" class="LineNr">427 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L428" class="LineNr">428 </span><span class="Normal">case</span> MAX: <span class="Delimiter">{</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L430" class="LineNr">430 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L430" class="LineNr">430 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L431" class="LineNr">431 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L432" class="LineNr">432 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L434" class="LineNr">434 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L435" class="LineNr">435 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L435" class="LineNr">435 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L436" class="LineNr">436 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L437" class="LineNr">437 </span>    <span class="Delimiter">}</span>
 <span id="L438" class="LineNr">438 </span>  <span class="Delimiter">}</span>
 <span id="L439" class="LineNr">439 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L440" class="LineNr">440 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L440" class="LineNr">440 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L441" class="LineNr">441 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L442" class="LineNr">442 </span>  <span class="Delimiter">}</span>
 <span id="L443" class="LineNr">443 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L444" class="LineNr">444 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L444" class="LineNr">444 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'max' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L445" class="LineNr">445 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L446" class="LineNr">446 </span>  <span class="Delimiter">}</span>
 <span id="L447" class="LineNr">447 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -528,21 +528,21 @@ if ('onhashchange' in window) {
 <span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L467" class="LineNr">467 </span><span class="Normal">case</span> MIN: <span class="Delimiter">{</span>
 <span id="L468" class="LineNr">468 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L469" class="LineNr">469 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L469" class="LineNr">469 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' needs at least two ingredients to compare in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L473" class="LineNr">473 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L474" class="LineNr">474 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L474" class="LineNr">474 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' can only compare numbers; got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L475" class="LineNr">475 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L476" class="LineNr">476 </span>    <span class="Delimiter">}</span>
 <span id="L477" class="LineNr">477 </span>  <span class="Delimiter">}</span>
 <span id="L478" class="LineNr">478 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L479" class="LineNr">479 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L479" class="LineNr">479 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' yields exactly one product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L480" class="LineNr">480 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L481" class="LineNr">481 </span>  <span class="Delimiter">}</span>
 <span id="L482" class="LineNr">482 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; !is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L483" class="LineNr">483 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L483" class="LineNr">483 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'min' should yield a number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L484" class="LineNr">484 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L485" class="LineNr">485 </span>  <span class="Delimiter">}</span>
 <span id="L486" class="LineNr">486 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/026call.cc.html b/html/026call.cc.html
index eb8d34c2..3d5c2634 100644
--- a/html/026call.cc.html
+++ b/html/026call.cc.html
@@ -126,7 +126,7 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span>routine::routine<span class="Delimiter">(</span><a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L64" class="LineNr"> 64 </span>    ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new routine; incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new routine; incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L66" class="LineNr"> 66 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Delimiter">}</span>
 <span id="L68" class="LineNr"> 68 </span>  calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>r<span class="Delimiter">));</span>
@@ -201,14 +201,14 @@ if ('onhashchange' in window) {
 <span id="L137" class="LineNr">137 </span><span class="Normal">void</span> dump_callstack<span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L138" class="LineNr">138 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Current_routine<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = ++Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L141" class="LineNr">141 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  called from &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L88'>to_instruction</a><span class="Delimiter">(</span>*p<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = ++Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L141" class="LineNr">141 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  called from &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L88'>to_instruction</a><span class="Delimiter">(</span>*p<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">:(after &quot;Defined Recipe Checks&quot;)</span>
 <span id="L145" class="LineNr">145 </span><span class="Comment">// not a primitive; check that it's present in the book of recipes</span>
 <span id="L146" class="LineNr">146 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;undefined operation in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L147" class="LineNr">147 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;undefined operation in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(replace{} &quot;default:&quot; following &quot;End Primitive Recipe Implementations&quot;)</span>
@@ -217,7 +217,7 @@ if ('onhashchange' in window) {
 <span id="L153" class="LineNr">153 </span>    <span class="Comment">// not a primitive; look up the book of recipes</span>
 <span id="L154" class="LineNr">154 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L155" class="LineNr">155 </span>      ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L157" class="LineNr">157 </span>      assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
 <span id="L158" class="LineNr">158 </span>    <span class="Delimiter">}</span>
 <span id="L159" class="LineNr">159 </span>    <span class="Normal">const</span> call&amp; caller_frame = <a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">();</span>
@@ -267,7 +267,7 @@ if ('onhashchange' in window) {
 <span id="L203" class="LineNr">203 </span><span class="Normal">while</span> <span class="Delimiter">(</span><a href='026call.cc.html#L84'>current_step_index</a><span class="Delimiter">()</span> &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>steps<span class="Delimiter">()))</span> <span class="Delimiter">{</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Comment">// Falling Through End Of Recipe</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;fall-through: exiting &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L206" class="LineNr">206 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;fall-through: exiting &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L207" class="LineNr">207 </span>    --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
 <span id="L208" class="LineNr">208 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Delimiter">}</span>
diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html
index ed093a4e..02e9a0d7 100644
--- a/html/027call_ingredient.cc.html
+++ b/html/027call_ingredient.cc.html
@@ -106,7 +106,7 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> NEXT_INGREDIENT: <span class="Delimiter">{</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'next-ingredient' didn't expect any ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'next-ingredient' didn't expect any ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -121,11 +121,11 @@ if ('onhashchange' in window) {
 <span id="L59" class="LineNr"> 59 </span>      <span class="Comment">// no ingredient types since the call might be implicit; assume ingredients are always strings</span>
 <span id="L60" class="LineNr"> 60 </span>      <span class="Comment">// todo: how to test this?</span>
 <span id="L61" class="LineNr"> 61 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>product<span class="Delimiter">))</span>
-<span id="L62" class="LineNr"> 62 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;main: wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;main: wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span>
 <span id="L65" class="LineNr"> 65 </span>                              <a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;': &quot;</span> &lt;&lt; <a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;wrong type for ingredient '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;': &quot;</span> &lt;&lt; <a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>next_ingredient_to_process<span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L67" class="LineNr"> 67 </span>      <span class="Comment">// End next-ingredient Type Mismatch Error</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Delimiter">}</span>
 <span id="L69" class="LineNr"> 69 </span>    products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>
@@ -136,7 +136,7 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span>  <span class="Delimiter">}</span>
 <span id="L75" class="LineNr"> 75 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L76" class="LineNr"> 76 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L77" class="LineNr"> 77 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no ingredient to <a href='003trace.cc.html#L133'>save</a> in '&quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L77" class="LineNr"> 77 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no ingredient to <a href='003trace.cc.html#L133'>save</a> in '&quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L79" class="LineNr"> 79 </span>    products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Comment">// pad the first product with sufficient zeros to match its type</span>
@@ -207,11 +207,11 @@ if ('onhashchange' in window) {
 <span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L146" class="LineNr">146 </span><span class="Normal">case</span> INGREDIENT: <span class="Delimiter">{</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'ingredient' expects exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'ingredient' expects exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'ingredient' expects a literal ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'ingredient' expects a literal ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L153" class="LineNr">153 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index 820a1977..8e7af8f6 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -100,7 +100,7 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr"> 38 </span><span class="Normal">case</span> RETURN: <span class="Delimiter">{</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Comment">// Begin Return</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;: decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;: decrementing callstack depth from &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L42" class="LineNr"> 42 </span>    --Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L44" class="LineNr"> 44 </span>      Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
@@ -111,9 +111,9 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span>  <span class="Comment">// just in case 'main' returns a value, drop it for now</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">goto</span> stop_running_current_routine<span class="Delimiter">;</span>
 <span id="L51" class="LineNr"> 51 </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#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L52" class="LineNr"> 52 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</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; i &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</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; i &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Comment">// make return products available to caller</span>
-<span id="L54" class="LineNr"> 54 </span>  copy<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
+<span id="L54" class="LineNr"> 54 </span>  copy<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Comment">// End Return</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of *caller* instruction</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">}</span>
@@ -125,7 +125,7 @@ if ('onhashchange' in window) {
 <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='028call_return.cc.html#L64'>check_types_of_return_instructions</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L65" class="LineNr"> 65 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check types of return instructions in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check types of return instructions in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Normal">const</span> instruction&amp; caller_instruction = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -137,7 +137,7 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>return_inst<span class="Delimiter">.</span>operation != RETURN<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>      <span class="Comment">// check types with the caller</span>
 <span id="L77" class="LineNr"> 77 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>return_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too few values returned from &quot;</span> &lt;&lt; callee<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too few values returned from &quot;</span> &lt;&lt; callee<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L79" class="LineNr"> 79 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L80" class="LineNr"> 80 </span>      <span class="Delimiter">}</span>
 <span id="L81" class="LineNr"> 81 </span>      <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#L141'>SIZE</a><span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -145,8 +145,8 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr"> 83 </span>        reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> rhs = caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>        <span class="Comment">// End Check RETURN Copy(lhs, rhs)</span>
 <span id="L85" class="LineNr"> 85 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>rhs<span class="Delimiter">,</span> lhs<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L86" class="LineNr"> 86 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; return_inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; ingredient '&quot;</span> &lt;&lt; lhs<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' can't be saved in '&quot;</span> &lt;&lt; rhs<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L87" class="LineNr"> 87 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  ['&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>lhs<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' vs '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>rhs<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;']</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L86" class="LineNr"> 86 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; return_inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; ingredient '&quot;</span> &lt;&lt; lhs<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' can't be saved in '&quot;</span> &lt;&lt; rhs<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  ['&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>lhs<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' vs '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>rhs<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;']</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>          <span class="Identifier">goto</span> finish_return_check<span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>        <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>      <span class="Delimiter">}</span>
@@ -156,16 +156,16 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>return_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot;same-as-ingredient&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L95" class="LineNr"> 95 </span>          string_tree* tmp = property<span class="Delimiter">(</span>return_inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot;same-as-ingredient&quot;</span><span class="Delimiter">);</span>
 <span id="L96" class="LineNr"> 96 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!tmp || !tmp<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L97" class="LineNr"> 97 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'same-as-ingredient' metadata should take exactly one value in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>return_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'same-as-ingredient' metadata should take exactly one value in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>return_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L98" class="LineNr"> 98 </span>            <span class="Identifier">goto</span> finish_return_check<span class="Delimiter">;</span>
 <span id="L99" class="LineNr"> 99 </span>          <span class="Delimiter">}</span>
 <span id="L100" class="LineNr">100 </span>          <span class="Normal">int</span> ingredient_index = to_integer<span class="Delimiter">(</span>tmp<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
 <span id="L101" class="LineNr">101 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too few ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too few ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>            <span class="Identifier">goto</span> finish_return_check<span class="Delimiter">;</span>
 <span id="L104" class="LineNr">104 </span>          <span class="Delimiter">}</span>
 <span id="L105" class="LineNr">105 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!is_dummy<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &amp;&amp; !is_literal<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">))</span> &amp;&amp; caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name != caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">).</span>name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should write to '&quot;</span> &lt;&lt; caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' rather than '&quot;</span> &lt;&lt; caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>caller_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' should write to '&quot;</span> &lt;&lt; caller_instruction<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' rather than '&quot;</span> &lt;&lt; caller_instruction<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span>          <span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>        <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>      <span class="Delimiter">}</span>
diff --git a/html/029tools.cc.html b/html/029tools.cc.html
index 3fa5e006..ea3c2618 100644
--- a/html/029tools.cc.html
+++ b/html/029tools.cc.html
@@ -66,9 +66,9 @@ if ('onhashchange' in window) {
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(scenario trace)</span>
 <span id="L4" class="LineNr">  4 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L5" class="LineNr">  5 </span>  <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [foo]<span class="Delimiter">,</span> [<span class="Normal">this</span> is a <a href='003trace.cc.html#L190'>trace</a> in Mu]
+<span id="L5" class="LineNr">  5 </span>  <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [foo]<span class="Delimiter">,</span> [<span class="Normal">this</span> is a <a href='003trace.cc.html#L189'>trace</a> in Mu]
 <span id="L6" class="LineNr">  6 </span>]
-<span id="L7" class="LineNr">  7 </span><span class="traceContains">+foo: this is a <a href='003trace.cc.html#L190'>trace</a> in Mu</span>
+<span id="L7" class="LineNr">  7 </span><span class="traceContains">+foo: this is a <a href='003trace.cc.html#L189'>trace</a> in Mu</span>
 <span id="L8" class="LineNr">  8 </span>
 <span id="L9" class="LineNr">  9 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L10" class="LineNr"> 10 </span>TRACE<span class="Delimiter">,</span>
@@ -77,15 +77,15 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Normal">case</span> TRACE: <span class="Delimiter">{</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt; <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'trace' takes three or more ingredients rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L16" class="LineNr"> 16 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'trace' takes three or more ingredients rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L17" class="LineNr"> 17 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'trace' should be a number (depth), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'trace' should be a number (depth), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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">}</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'trace' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'trace' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Delimiter">}</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -99,7 +99,7 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">2</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span>    out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Delimiter">}</span>
-<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span>depth<span class="Delimiter">,</span> label<span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span>depth<span class="Delimiter">,</span> label<span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L40" class="LineNr"> 40 </span><span class="Delimiter">}</span>
 <span id="L41" class="LineNr"> 41 </span>
@@ -120,7 +120,7 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i<span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
 <span id="L57" class="LineNr"> 57 </span>    out &lt;&lt; inspect<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Delimiter">}</span>
-<span id="L59" class="LineNr"> 59 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;app&quot;</span><span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;app&quot;</span><span class="Delimiter">)</span> &lt;&lt; out<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L61" class="LineNr"> 61 </span><span class="Delimiter">}</span>
 <span id="L62" class="LineNr"> 62 </span>
@@ -211,10 +211,10 @@ if ('onhashchange' in window) {
 <span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L148" class="LineNr">148 </span><span class="Normal">case</span> _DUMP_TRACE: <span class="Delimiter">{</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L150" class="LineNr">150 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">);</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
@@ -261,7 +261,7 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span><span class="Normal">case</span> _PRINT: <span class="Delimiter">{</span>
 <span id="L198" class="LineNr">198 </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#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L199" class="LineNr">199 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L200" class="LineNr">200 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;$print: &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;$print: &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L201" class="LineNr">201 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot;newline&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L202" class="LineNr">202 </span>        cout &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
 <span id="L203" class="LineNr">203 </span>      <span class="Delimiter">}</span>
@@ -274,7 +274,7 @@ if ('onhashchange' in window) {
 <span id="L210" class="LineNr">210 </span>    <span class="Comment">// End $print Special-cases</span>
 <span id="L211" class="LineNr">211 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L212" class="LineNr">212 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L213" class="LineNr">213 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;$print: &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;$print: &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L214" class="LineNr">214 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span> cout &lt;&lt; <span class="Constant">&quot; &quot;</span><span class="Delimiter">;</span>
 <span id="L215" class="LineNr">215 </span>        cout &lt;&lt; no_scientific<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
 <span id="L216" class="LineNr">216 </span>      <span class="Delimiter">}</span>
@@ -305,11 +305,11 @@ if ('onhashchange' in window) {
 <span id="L241" class="LineNr">241 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L242" class="LineNr">242 </span><span class="Normal">case</span> _SYSTEM: <span class="Delimiter">{</span>
 <span id="L243" class="LineNr">243 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$system' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$system' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L245" class="LineNr">245 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Delimiter">}</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient to '$system' must be a literal text, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient to '$system' must be a literal text, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L249" class="LineNr">249 </span>  <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>
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 775f6bc0..be3a144c 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -161,7 +161,7 @@ if ('onhashchange' in window) {
 <span id="L96" class="LineNr"> 96 </span><span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// error value, but we'll raise it elsewhere</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L98" class="LineNr"> 98 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;no such type &quot;</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>value &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;no such type &quot;</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>value &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span><span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>type_info t = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
@@ -171,7 +171,7 @@ if ('onhashchange' in window) {
 <span id="L106" class="LineNr">106 </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#L141'>SIZE</a><span class="Delimiter">(</span>t<span class="Delimiter">.</span>elements<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L107" class="LineNr">107 </span>    <span class="Comment">// todo: strengthen assertion to disallow mutual type recursion</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>t<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">-&gt;</span>value == type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;container &quot;</span> &lt;&lt; t<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't include itself as a member</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;container &quot;</span> &lt;&lt; t<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't include itself as a member</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L110" class="LineNr">110 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L111" class="LineNr">111 </span>    <span class="Delimiter">}</span>
 <span id="L112" class="LineNr">112 </span>    result += size_of<span class="Delimiter">(</span><a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> i<span class="Delimiter">));</span>
@@ -207,24 +207,24 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L143" class="LineNr">143 </span><span class="Normal">case</span> GET: <span class="Delimiter">{</span>
 <span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L146" class="LineNr">146 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Delimiter">}</span>
 <span id="L148" class="LineNr">148 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// new copy for every invocation</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Comment">// Update GET base in Check</span>
 <span id="L150" class="LineNr">150 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L153" class="LineNr">153 </span>  <span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Comment">// Update GET base_type in Check</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L180'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L158" class="LineNr">158 </span>    <span class="Identifier">break</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="Normal">const</span> reagent&amp; offset = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> || !is_mu_scalar<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'get' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L162" class="LineNr">162 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'get' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">int</span> offset_value = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -233,7 +233,7 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr">168 </span>  <span class="Delimiter">}</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Comment">// End update GET offset_value in Check</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset_value &lt; <span class="Constant">0</span> || offset_value &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>elements<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L171" class="LineNr">171 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid offset '&quot;</span> &lt;&lt; offset_value &lt;&lt; <span class="Constant">&quot;' for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid offset '&quot;</span> &lt;&lt; offset_value &lt;&lt; <span class="Constant">&quot;' for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L172" class="LineNr">172 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Delimiter">}</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -242,7 +242,7 @@ if ('onhashchange' in window) {
 <span id="L177" class="LineNr">177 </span>  <span class="Comment">//: use base.type rather than base_type because later layers will introduce compound types</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Normal">const</span> reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset_value<span class="Delimiter">);</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span> element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L180" class="LineNr">180 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>product<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L180" class="LineNr">180 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>product<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L181" class="LineNr">181 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Delimiter">}</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -253,7 +253,7 @@ if ('onhashchange' in window) {
 <span id="L188" class="LineNr">188 </span>  <span class="Comment">// Update GET base in Run</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L191" class="LineNr">191 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L191" class="LineNr">191 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
@@ -263,11 +263,11 @@ if ('onhashchange' in window) {
 <span id="L198" class="LineNr">198 </span>  <span class="Normal">int</span> src = base_address<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; offset<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span>
 <span id="L200" class="LineNr">200 </span>    src += size_of<span class="Delimiter">(</span><a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> i<span class="Delimiter">));</span>
-<span id="L201" class="LineNr">201 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; src &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L201" class="LineNr">201 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; src &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Comment">//: use base.type rather than base_type because later layers will introduce compound types</span>
 <span id="L203" class="LineNr">203 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> element = <a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset<span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span>src<span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L205" class="LineNr">205 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L206" class="LineNr">206 </span>  <span class="Comment">// Read element</span>
 <span id="L207" class="LineNr">207 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>element<span class="Delimiter">));</span>
 <span id="L208" class="LineNr">208 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -356,25 +356,25 @@ if ('onhashchange' in window) {
 <span id="L291" class="LineNr">291 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L292" class="LineNr">292 </span><span class="Normal">case</span> PUT: <span class="Delimiter">{</span>
 <span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put' expects exactly 3 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put' expects exactly 3 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L295" class="LineNr">295 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
 <span id="L297" class="LineNr">297 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Comment">// Update PUT base in Check</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'put' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'put' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
 <span id="L303" class="LineNr">303 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L304" class="LineNr">304 </span>  <span class="Comment">// Update PUT base_type in Check</span>
 <span id="L305" class="LineNr">305 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L180'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'put' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L306" class="LineNr">306 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'put' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L307" class="LineNr">307 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
 <span id="L309" class="LineNr">309 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> offset = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L310" class="LineNr">310 </span>  <span class="Comment">// Update PUT offset in Check</span>
 <span id="L311" class="LineNr">311 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> || !is_mu_scalar<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L312" class="LineNr">312 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'put' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L312" class="LineNr">312 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'put' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L313" class="LineNr">313 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Delimiter">}</span>
 <span id="L315" class="LineNr">315 </span>  <span class="Normal">int</span> offset_value = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -382,7 +382,7 @@ if ('onhashchange' in window) {
 <span id="L317" class="LineNr">317 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>offset<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L318" class="LineNr">318 </span>    offset_value = to_integer<span class="Delimiter">(</span>offset<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
 <span id="L319" class="LineNr">319 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>offset_value &lt; <span class="Constant">0</span> || offset_value &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>elements<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L320" class="LineNr">320 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid offset '&quot;</span> &lt;&lt; offset_value &lt;&lt; <span class="Constant">&quot;' for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L320" class="LineNr">320 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid offset '&quot;</span> &lt;&lt; offset_value &lt;&lt; <span class="Constant">&quot;' for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L321" class="LineNr">321 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L322" class="LineNr">322 </span>    <span class="Delimiter">}</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Delimiter">}</span>
@@ -393,12 +393,12 @@ if ('onhashchange' in window) {
 <span id="L328" class="LineNr">328 </span>  <span class="Comment">//: use base.type rather than base_type because later layers will introduce compound types</span>
 <span id="L329" class="LineNr">329 </span>  <span class="Normal">const</span> reagent&amp; element = <a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> offset_value<span class="Delimiter">);</span>
 <span id="L330" class="LineNr">330 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L331" class="LineNr">331 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; value<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>value<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L331" class="LineNr">331 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; value<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>value<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L332" class="LineNr">332 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L333" class="LineNr">333 </span>  <span class="Delimiter">}</span>
 <span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// no more checks necessary</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Comment">// End PUT Product Checks</span>
@@ -410,7 +410,7 @@ if ('onhashchange' in window) {
 <span id="L345" class="LineNr">345 </span>  <span class="Comment">// Update PUT base in Run</span>
 <span id="L346" class="LineNr">346 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L347" class="LineNr">347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L348" class="LineNr">348 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L348" class="LineNr">348 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L349" class="LineNr">349 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L350" class="LineNr">350 </span>  <span class="Delimiter">}</span>
 <span id="L351" class="LineNr">351 </span>  <span class="Normal">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
@@ -420,13 +420,13 @@ if ('onhashchange' in window) {
 <span id="L355" class="LineNr">355 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L101'>address</a> = base_address<span class="Delimiter">;</span>
 <span id="L356" class="LineNr">356 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i &lt; offset<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span>
 <span id="L357" class="LineNr">357 </span>    <a href='043space.cc.html#L101'>address</a> += size_of<span class="Delimiter">(</span><a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> i<span class="Delimiter">));</span>
-<span id="L358" class="LineNr">358 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L358" class="LineNr">358 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L359" class="LineNr">359 </span>  <span class="Comment">// optimization: directly write the element rather than updating 'product'</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Comment">// and writing the entire container</span>
 <span id="L361" class="LineNr">361 </span>  <span class="Comment">// Write Memory in PUT in Run</span>
 <span id="L362" class="LineNr">362 </span>  write_products =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L363" class="LineNr">363 </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#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L364" class="LineNr">364 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; address+i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr">364 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; address+i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L365" class="LineNr">365 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address+i<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L366" class="LineNr">366 </span>  <span class="Delimiter">}</span>
 <span id="L367" class="LineNr">367 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -513,16 +513,16 @@ if ('onhashchange' in window) {
 <span id="L448" class="LineNr">448 </span>  string name = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L449" class="LineNr">449 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L450" class="LineNr">450 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L451" class="LineNr">451 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete container definition at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L451" class="LineNr">451 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete container definition at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L452" class="LineNr">452 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L453" class="LineNr">453 </span>  <span class="Delimiter">}</span>
 <span id="L454" class="LineNr">454 </span>  <span class="Comment">// End container Name Refinements</span>
-<span id="L455" class="LineNr">455 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- defining &quot;</span> &lt;&lt; command &lt;&lt; <span class="Constant">' '</span> &lt;&lt; name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L455" class="LineNr">455 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- defining &quot;</span> &lt;&lt; command &lt;&lt; <span class="Constant">' '</span> &lt;&lt; name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L456" class="LineNr">456 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span>
 <span id="L457" class="LineNr">457 </span>      || get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L458" class="LineNr">458 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">,</span> Next_type_ordinal++<span class="Delimiter">);</span>
 <span id="L459" class="LineNr">459 </span>  <span class="Delimiter">}</span>
-<span id="L460" class="LineNr">460 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type number: &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L460" class="LineNr">460 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type number: &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L461" class="LineNr">461 </span>  <a href='030container.cc.html#L518'>skip_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">&quot;'&quot;</span>+command+<span class="Constant">&quot;' must begin with '['&quot;</span><span class="Delimiter">);</span>
 <span id="L462" class="LineNr">462 </span>  type_info&amp; info = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">));</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>Num_calls_to_transform_all_at_first_definition == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -531,7 +531,7 @@ if ('onhashchange' in window) {
 <span id="L466" class="LineNr">466 </span>  <span class="Delimiter">}</span>
 <span id="L467" class="LineNr">467 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>Num_calls_to_transform_all_at_first_definition != Num_calls_to_transform_all<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L468" class="LineNr">468 </span>    <span class="Comment">// extension after transform_all</span>
-<span id="L469" class="LineNr">469 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;there was a call to transform_all() between the definition of container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' and a subsequent extension. This is not supported, since any recipes that used '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' values have already been transformed and </span><span class="cSpecial">\&quot;</span><span class="Constant">frozen</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L469" class="LineNr">469 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;there was a call to transform_all() between the definition of container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' and a subsequent extension. This is not supported, since any recipes that used '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' values have already been transformed and </span><span class="cSpecial">\&quot;</span><span class="Constant">frozen</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L470" class="LineNr">470 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L471" class="LineNr">471 </span>  <span class="Delimiter">}</span>
 <span id="L472" class="LineNr">472 </span>  info<span class="Delimiter">.</span>name = name<span class="Delimiter">;</span>
@@ -541,12 +541,12 @@ if ('onhashchange' in window) {
 <span id="L476" class="LineNr">476 </span>    string element = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L477" class="LineNr">477 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>element<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L478" class="LineNr">478 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L479" class="LineNr">479 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete container definition at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L479" class="LineNr">479 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete container definition at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L480" class="LineNr">480 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L481" class="LineNr">481 </span>    <span class="Delimiter">}</span>
 <span id="L482" class="LineNr">482 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>element == <span class="Constant">&quot;]&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L483" class="LineNr">483 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L484" class="LineNr">484 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; command &lt;&lt; <span class="Constant">&quot; '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' contains multiple elements on a single line. Containers and exclusive containers must only contain elements, one to a line, no code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L484" class="LineNr">484 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; command &lt;&lt; <span class="Constant">&quot; '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' contains multiple elements on a single line. Containers and exclusive containers must only contain elements, one to a line, no code.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L485" class="LineNr">485 </span>      <span class="Comment">// skip rest of container declaration</span>
 <span id="L486" class="LineNr">486 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L239'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L487" class="LineNr">487 </span>        <a href='011load.cc.html#L211'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
@@ -557,7 +557,7 @@ if ('onhashchange' in window) {
 <span id="L492" class="LineNr">492 </span>    info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>element<span class="Delimiter">));</span>
 <span id="L493" class="LineNr">493 </span>    expand_type_abbreviations<span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">);</span>  <span class="Comment">// todo: use abbreviation before declaration</span>
 <span id="L494" class="LineNr">494 </span>    <a href='030container.cc.html#L500'>replace_unknown_types_with_unique_ordinals</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">,</span> info<span class="Delimiter">);</span>
-<span id="L495" class="LineNr">495 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  element: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L495" class="LineNr">495 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  element: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L496" class="LineNr">496 </span>    <span class="Comment">// End Load Container Element Definition</span>
 <span id="L497" class="LineNr">497 </span>  <span class="Delimiter">}</span>
 <span id="L498" class="LineNr">498 </span><span class="Delimiter">}</span>
@@ -583,7 +583,7 @@ if ('onhashchange' in window) {
 <span id="L518" class="LineNr">518 </span><span class="Normal">void</span> <a href='030container.cc.html#L518'>skip_bracket</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">,</span> string message<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L519" class="LineNr">519 </span>  <a href='011load.cc.html#L211'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L520" class="LineNr">520 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span>
-<span id="L521" class="LineNr">521 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; message &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L521" class="LineNr">521 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; message &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">:(scenario multi_word_line_in_container_declaration)</span>
@@ -612,7 +612,7 @@ if ('onhashchange' in window) {
 <span id="L547" class="LineNr">547 </span><span class="Comment">// extremely inefficient; we process all types over and over again, once for every single recipe</span>
 <span id="L548" class="LineNr">548 </span><span class="Comment">// but it doesn't seem to cause any noticeable slowdown</span>
 <span id="L549" class="LineNr">549 </span><span class="Normal">void</span> <a href='030container.cc.html#L549'>expand_type_abbreviations_in_containers</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L550" class="LineNr">550 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L550" class="LineNr">550 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L551" class="LineNr">551 </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#L141'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L552" class="LineNr">552 </span>      expand_type_abbreviations<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
 <span id="L553" class="LineNr">553 </span>  <span class="Delimiter">}</span>
@@ -633,12 +633,12 @@ if ('onhashchange' in window) {
 <span id="L568" class="LineNr">568 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L569" class="LineNr">569 </span>  <span class="Comment">// try to extend the container after transform</span>
 <span id="L570" class="LineNr">570 </span>  <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
-<span id="L571" class="LineNr">571 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
+<span id="L571" class="LineNr">571 </span>  <a href='003trace.cc.html#L256'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
 <span id="L572" class="LineNr">572 </span>  Hide_errors =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L573" class="LineNr">573 </span>  run<span class="Delimiter">(</span><span class="Constant">&quot;container foo [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L574" class="LineNr">574 </span>      <span class="Constant">&quot;  b:num</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L575" class="LineNr">575 </span>      <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L576" class="LineNr">576 </span>  <a href='003trace.cc.html#L256'>CHECK_TRACE_CONTAINS_ERRORS</a><span class="Delimiter">();</span>
+<span id="L576" class="LineNr">576 </span>  <a href='003trace.cc.html#L255'>CHECK_TRACE_CONTAINS_ERRORS</a><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">//:: Allow container definitions anywhere in the codebase, but complain if you</span>
@@ -667,7 +667,7 @@ if ('onhashchange' in window) {
 <span id="L602" class="LineNr">602 </span><span class="Delimiter">:(code)</span>
 <span id="L603" class="LineNr">603 </span><span class="Normal">void</span> check_or_set_invalid_types<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L604" class="LineNr">604 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L605" class="LineNr">605 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check for invalid types in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L605" class="LineNr">605 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check for invalid types in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L606" class="LineNr">606 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L607" class="LineNr">607 </span>    instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L608" class="LineNr">608 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -697,7 +697,7 @@ if ('onhashchange' in window) {
 <span id="L632" class="LineNr">632 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span>
 <span id="L633" class="LineNr">633 </span>      type<span class="Delimiter">-&gt;</span>value = get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
 <span id="L634" class="LineNr">634 </span>    <span class="Normal">else</span>
-<span id="L635" class="LineNr">635 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; location_for_error_messages &lt;&lt; <span class="Constant">&quot;unknown type &quot;</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; name_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L635" class="LineNr">635 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; location_for_error_messages &lt;&lt; <span class="Constant">&quot;unknown type &quot;</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; name_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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>
@@ -730,7 +730,7 @@ if ('onhashchange' in window) {
 <span id="L665" class="LineNr">665 </span>
 <span id="L666" class="LineNr">666 </span><span class="Delimiter">:(code)</span>
 <span id="L667" class="LineNr">667 </span><span class="Normal">void</span> check_container_field_types<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L668" class="LineNr">668 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L668" class="LineNr">668 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;type_ordinal<span class="Delimiter">,</span> type_info&gt;::iterator p = Type<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Type<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L669" class="LineNr">669 </span>    <span class="Normal">const</span> type_info&amp; info = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L670" class="LineNr">670 </span>    <span class="Comment">// Check Container Field Types(info)</span>
 <span id="L671" class="LineNr">671 </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#L141'>SIZE</a><span class="Delimiter">(</span>info<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -747,7 +747,7 @@ if ('onhashchange' in window) {
 <span id="L682" class="LineNr">682 </span>  <span class="Delimiter">}</span>
 <span id="L683" class="LineNr">683 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>value != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// value 0 = compound types (layer parse_tree) or type ingredients (layer shape_shifting_container)</span>
 <span id="L684" class="LineNr">684 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span>
-<span id="L685" class="LineNr">685 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; location_for_error_messages &lt;&lt; <span class="Constant">&quot;unknown type in &quot;</span> &lt;&lt; name_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L685" class="LineNr">685 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; location_for_error_messages &lt;&lt; <span class="Constant">&quot;unknown type in &quot;</span> &lt;&lt; name_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L686" class="LineNr">686 </span>  <span class="Delimiter">}</span>
 <span id="L687" class="LineNr">687 </span><span class="Delimiter">}</span>
 <span id="L688" class="LineNr">688 </span>
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 0e600de0..2650b295 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -177,12 +177,12 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">:(code)</span>
 <span id="L115" class="LineNr">115 </span><span class="Normal">void</span> <a href='031merge.cc.html#L115'>check_merge_calls</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check merge instructions in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L117" class="LineNr">117 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check merge instructions in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L119" class="LineNr">119 </span>    <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L120" class="LineNr">120 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;merge&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L122" class="LineNr">122 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a single product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a single product in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L123" class="LineNr">123 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span>    <span class="Delimiter">}</span>
 <span id="L125" class="LineNr">125 </span>    reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -190,12 +190,12 @@ if ('onhashchange' in window) {
 <span id="L127" class="LineNr">127 </span>    <span class="Normal">const</span> type_tree* product_base_type = product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? product<span class="Delimiter">.</span>type : product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L128" class="LineNr">128 </span>    assert<span class="Delimiter">(</span>product_base_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L129" class="LineNr">129 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>product_base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> product_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L130" class="LineNr">130 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a container in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a container in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L131" class="LineNr">131 </span>      <span class="Identifier">continue</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">const</span> type_info&amp; info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> product_base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
 <span id="L134" class="LineNr">134 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L180'>CONTAINER</a> &amp;&amp; info<span class="Delimiter">.</span>kind != <a href='010vm.cc.html#L181'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a container in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'merge' should yield a container in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>    <span class="Delimiter">}</span>
 <span id="L138" class="LineNr">138 </span>    <a href='031merge.cc.html#L142'>check_merge_call</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">,</span> product<span class="Delimiter">,</span> caller<span class="Delimiter">,</span> inst<span class="Delimiter">);</span>
@@ -208,9 +208,9 @@ if ('onhashchange' in window) {
 <span id="L145" class="LineNr">145 </span>  state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>push<span class="Delimiter">(</span>merge_check_point<span class="Delimiter">(</span>product<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L146" class="LineNr">146 </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="L147" class="LineNr">147 </span>    assert<span class="Delimiter">(</span>!state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L149" class="LineNr">149 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too few ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L150" class="LineNr">150 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too few ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>    reagent&amp; container = state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container<span class="Delimiter">;</span>
@@ -224,7 +224,7 @@ if ('onhashchange' in window) {
 <span id="L161" class="LineNr">161 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span> &amp;&amp; <a href='021check_instruction.cc.html#L91'>types_coercible</a><span class="Delimiter">(</span>container<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span>
 <span id="L162" class="LineNr">162 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L163" class="LineNr">163 </span>        <span class="Normal">const</span> reagent&amp; expected_ingredient = <a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>container<span class="Delimiter">.</span>type<span class="Delimiter">,</span> state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index<span class="Delimiter">);</span>
-<span id="L164" class="LineNr">164 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; || &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; || &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L165" class="LineNr">165 </span>        <span class="Comment">// if the current element is the ingredient we expect, move on to the next element/ingredient</span>
 <span id="L166" class="LineNr">166 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='021check_instruction.cc.html#L91'>types_coercible</a><span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L167" class="LineNr">167 </span>          ++ingredient_index<span class="Delimiter">;</span>
@@ -233,7 +233,7 @@ if ('onhashchange' in window) {
 <span id="L170" class="LineNr">170 </span>            state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>pop<span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>            <span class="Normal">if</span> <span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L172" class="LineNr">172 </span>              <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">))</span>
-<span id="L173" class="LineNr">173 </span>                <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L173" class="LineNr">173 </span>                <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L174" class="LineNr">174 </span>              <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L175" class="LineNr">175 </span>            <span class="Delimiter">}</span>
 <span id="L176" class="LineNr">176 </span>            ++state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index<span class="Delimiter">;</span>
@@ -249,9 +249,9 @@ if ('onhashchange' in window) {
 <span id="L186" class="LineNr">186 </span>      <span class="Comment">// End check_merge_call Special-cases</span>
 <span id="L187" class="LineNr">187 </span>      <span class="Normal">default</span>: <span class="Delimiter">{</span>
 <span id="L188" class="LineNr">188 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>container<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L189" class="LineNr">189 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incorrect type of ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L190" class="LineNr">190 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (expected '&quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L191" class="LineNr">191 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (got '&quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L189" class="LineNr">189 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incorrect type of ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (expected '&quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L191" class="LineNr">191 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (got '&quot;</span> &lt;&lt; debug_string<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L192" class="LineNr">192 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L193" class="LineNr">193 </span>        <span class="Delimiter">}</span>
 <span id="L194" class="LineNr">194 </span>        ++ingredient_index<span class="Delimiter">;</span>
@@ -260,7 +260,7 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span>          state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>pop<span class="Delimiter">();</span>
 <span id="L198" class="LineNr">198 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L199" class="LineNr">199 </span>            <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">))</span>
-<span id="L200" class="LineNr">200 </span>              <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span>              <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L201" class="LineNr">201 </span>            <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L202" class="LineNr">202 </span>          <span class="Delimiter">}</span>
 <span id="L203" class="LineNr">203 </span>          ++state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index<span class="Delimiter">;</span>
diff --git a/html/032array.cc.html b/html/032array.cc.html
index 65369b1a..57c3220b 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -84,29 +84,29 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Normal">case</span> CREATE_ARRAY: <span class="Delimiter">{</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'create-array' needs one product and no ingredients but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'create-array' needs one product and no ingredients but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<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>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Comment">// Update CREATE_ARRAY product in Check</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_array<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'create-array' cannot create non-array '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'create-array' cannot create non-array '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</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 class="Normal">if</span> <span class="Delimiter">(</span>!product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;create array of what? '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;create array of what? '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L34" class="LineNr"> 34 </span>    <span class="Identifier">break</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="Comment">// 'create-array' will need to check properties rather than types</span>
 <span id="L37" class="LineNr"> 37 </span>  type_tree* array_length_from_type = product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">;</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!array_length_from_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;create array of what size? '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;create array of what size? '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
 <span id="L43" class="LineNr"> 43 </span>    array_length_from_type = array_length_from_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span>array_length_from_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'create-array' product should specify size of array after its element type, but got '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'create-array' product should specify size of array after its element type, but got '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -121,10 +121,10 @@ if ('onhashchange' in window) {
 <span id="L57" class="LineNr"> 57 </span>    array_length_from_type = array_length_from_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Normal">int</span> <a href='032array.cc.html#L319'>array_length</a> = to_integer<span class="Delimiter">(</span>array_length_from_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// initialize array length, so that size_of will work</span>
-<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; <a href='032array.cc.html#L319'>array_length</a> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; <a href='032array.cc.html#L319'>array_length</a> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L61" class="LineNr"> 61 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">,</span> <a href='032array.cc.html#L319'>array_length</a><span class="Delimiter">);</span>  <span class="Comment">// in array elements</span>
 <span id="L62" class="LineNr"> 62 </span>  <span class="Normal">int</span> size = size_of<span class="Delimiter">(</span>product<span class="Delimiter">);</span>  <span class="Comment">// in locations</span>
-<span id="L63" class="LineNr"> 63 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating array from &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; locations&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating array from &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; locations&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment">// initialize array</span>
 <span id="L65" class="LineNr"> 65 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span>  i &lt;= size_of<span class="Delimiter">(</span>product<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L66" class="LineNr"> 66 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address+i<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
@@ -169,7 +169,7 @@ if ('onhashchange' in window) {
 <span id="L105" class="LineNr">105 </span><span class="Delimiter">:(before &quot;End size_of(reagent r) Special-cases&quot;)</span>
 <span id="L106" class="LineNr">106 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom &amp;&amp; r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value == Array_type_ordinal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' is an array of what?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L108" class="LineNr">108 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' is an array of what?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>    <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Delimiter">}</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Identifier">return</span> <span class="Comment">/*</span><span class="Comment">space for length</span><span class="Comment">*/</span><span class="Constant">1</span> + <a href='032array.cc.html#L319'>array_length</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span><a href='032array.cc.html#L303'>array_element</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
@@ -219,16 +219,16 @@ if ('onhashchange' in window) {
 <span id="L155" class="LineNr">155 </span><span class="Delimiter">{</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Normal">const</span> type_tree* type = info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>type<span class="Delimiter">;</span>
 <span id="L157" class="LineNr">157 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>type &amp;&amp; type<span class="Delimiter">-&gt;</span>atom &amp;&amp; type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L158" class="LineNr">158 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' doesn't specify type of array elements for '&quot;</span> &lt;&lt; info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L158" class="LineNr">158 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' doesn't specify type of array elements for '&quot;</span> &lt;&lt; info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L159" class="LineNr">159 </span>    <span class="Identifier">continue</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="Normal">if</span> <span class="Delimiter">(</span>type &amp;&amp; !type<span class="Delimiter">-&gt;</span>atom &amp;&amp; type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom &amp;&amp; type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;array&quot;</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>!type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L163" class="LineNr">163 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' doesn't specify type of array elements for '&quot;</span> &lt;&lt; info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' doesn't specify type of array elements for '&quot;</span> &lt;&lt; info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L164" class="LineNr">164 </span>      <span class="Identifier">continue</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="Normal">if</span> <span class="Delimiter">(</span>!type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right || !is_integer<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// array has no length</span>
-<span id="L167" class="LineNr">167 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' cannot determine size of element '&quot;</span> &lt;&lt; info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L167" class="LineNr">167 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;container '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' cannot determine size of element '&quot;</span> &lt;&lt; info<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>back<span class="Delimiter">().</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L168" class="LineNr">168 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L169" class="LineNr">169 </span>    <span class="Delimiter">}</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Delimiter">}</span>
@@ -308,19 +308,19 @@ if ('onhashchange' in window) {
 <span id="L244" class="LineNr">244 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L245" class="LineNr">245 </span><span class="Normal">case</span> INDEX: <span class="Delimiter">{</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L247" class="LineNr">247 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'index' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L247" class="LineNr">247 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'index' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L248" class="LineNr">248 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Delimiter">}</span>
 <span id="L250" class="LineNr">250 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L251" class="LineNr">251 </span>  <span class="Comment">// Update INDEX base in Check</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_array<span class="Delimiter">(</span>base<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'index' on a non-array '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'index' on a non-array '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L254" class="LineNr">254 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
 <span id="L256" class="LineNr">256 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L257" class="LineNr">257 </span>  <span class="Comment">// Update INDEX index in Check</span>
 <span id="L258" class="LineNr">258 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>index<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L259" class="LineNr">259 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'index' should be a number, but got '&quot;</span> &lt;&lt; index<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L259" class="LineNr">259 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'index' should be a number, but got '&quot;</span> &lt;&lt; index<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L260" class="LineNr">260 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L261" class="LineNr">261 </span>  <span class="Delimiter">}</span>
 <span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -328,7 +328,7 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span>  <span class="Comment">// Update INDEX product in Check</span>
 <span id="L265" class="LineNr">265 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">(</span><a href='032array.cc.html#L299'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L266" class="LineNr">266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span> element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L267" class="LineNr">267 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'index' on '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' can't be saved in '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'; type should be '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'index' on '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' can't be saved in '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'; type should be '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L268" class="LineNr">268 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Delimiter">}</span>
 <span id="L270" class="LineNr">270 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -338,22 +338,22 @@ if ('onhashchange' in window) {
 <span id="L274" class="LineNr">274 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L275" class="LineNr">275 </span>  <span class="Comment">// Update INDEX base in Run</span>
 <span id="L276" class="LineNr">276 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
-<span id="L277" class="LineNr">277 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;base <a href='043space.cc.html#L101'>address</a> is &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L277" class="LineNr">277 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;base <a href='043space.cc.html#L101'>address</a> is &quot;</span> &lt;&lt; base_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L279" class="LineNr">279 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L279" class="LineNr">279 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L280" class="LineNr">280 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Delimiter">}</span>
 <span id="L282" class="LineNr">282 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L283" class="LineNr">283 </span>  <span class="Comment">// Update INDEX index in Run</span>
 <span id="L284" class="LineNr">284 </span>  vector&lt;<span class="Normal">double</span>&gt; index_val<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>index<span class="Delimiter">));</span>
 <span id="L285" class="LineNr">285 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt; <span class="Constant">0</span> || index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &gt;= <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L286" class="LineNr">286 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L286" class="LineNr">286 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L287" class="LineNr">287 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Delimiter">}</span>
 <span id="L289" class="LineNr">289 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">(</span><a href='032array.cc.html#L299'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L290" class="LineNr">290 </span>  element<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span>base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; element<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L292" class="LineNr">292 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; element<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L292" class="LineNr">292 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;its type is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L293" class="LineNr">293 </span>  <span class="Comment">// Read element</span>
 <span id="L294" class="LineNr">294 </span>  products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>element<span class="Delimiter">));</span>
 <span id="L295" class="LineNr">295 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -468,31 +468,31 @@ if ('onhashchange' in window) {
 <span id="L404" class="LineNr">404 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L405" class="LineNr">405 </span><span class="Normal">case</span> PUT_INDEX: <span class="Delimiter">{</span>
 <span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L407" class="LineNr">407 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put-index' expects exactly 3 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L407" class="LineNr">407 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put-index' expects exactly 3 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L408" class="LineNr">408 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L409" class="LineNr">409 </span>  <span class="Delimiter">}</span>
 <span id="L410" class="LineNr">410 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L411" class="LineNr">411 </span>  <span class="Comment">// Update PUT_INDEX base in Check</span>
 <span id="L412" class="LineNr">412 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_array<span class="Delimiter">(</span>base<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L413" class="LineNr">413 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put-index' on a non-array '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L413" class="LineNr">413 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put-index' on a non-array '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L417" class="LineNr">417 </span>  <span class="Comment">// Update PUT_INDEX index in Check</span>
 <span id="L418" class="LineNr">418 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>index<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L419" class="LineNr">419 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'put-index' should have type 'number', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L419" class="LineNr">419 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'put-index' should have type 'number', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> value = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L423" class="LineNr">423 </span>  <span class="Comment">// Update PUT_INDEX value in Check</span>
 <span id="L424" class="LineNr">424 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> element<span class="Delimiter">(</span><a href='032array.cc.html#L299'>copy_array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
 <span id="L425" class="LineNr">425 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>element<span class="Delimiter">,</span> value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L426" class="LineNr">426 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put-index &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' should store &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; value<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>value<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L426" class="LineNr">426 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'put-index &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' should store &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; value<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>value<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L427" class="LineNr">427 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L428" class="LineNr">428 </span>  <span class="Delimiter">}</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// no more checks necessary</span>
 <span id="L430" class="LineNr">430 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L431" class="LineNr">431 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put-index' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L431" class="LineNr">431 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put-index' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L432" class="LineNr">432 </span>    <span class="Identifier">break</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="Comment">// End PUT_INDEX Product Checks</span>
@@ -504,25 +504,25 @@ if ('onhashchange' in window) {
 <span id="L440" class="LineNr">440 </span>  <span class="Comment">// Update PUT_INDEX base in Run</span>
 <span id="L441" class="LineNr">441 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L442" class="LineNr">442 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L443" class="LineNr">443 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L444" class="LineNr">444 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L445" class="LineNr">445 </span>  <span class="Delimiter">}</span>
 <span id="L446" class="LineNr">446 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> index = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L447" class="LineNr">447 </span>  <span class="Comment">// Update PUT_INDEX index in Run</span>
 <span id="L448" class="LineNr">448 </span>  vector&lt;<span class="Normal">double</span>&gt; index_val<span class="Delimiter">(</span>read_memory<span class="Delimiter">(</span>index<span class="Delimiter">));</span>
 <span id="L449" class="LineNr">449 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt; <span class="Constant">0</span> || index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &gt;= <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L450" class="LineNr">450 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L450" class="LineNr">450 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;invalid index &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L451" class="LineNr">451 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L452" class="LineNr">452 </span>  <span class="Delimiter">}</span>
 <span id="L453" class="LineNr">453 </span>  <span class="Normal">int</span> <a href='043space.cc.html#L101'>address</a> = base_address + <span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span> + index_val<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span>*size_of<span class="Delimiter">(</span><a href='032array.cc.html#L303'>array_element</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">));</span>
-<span id="L454" class="LineNr">454 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L454" class="LineNr">454 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy to is &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L455" class="LineNr">455 </span>  <span class="Comment">// optimization: directly write the element rather than updating 'product'</span>
 <span id="L456" class="LineNr">456 </span>  <span class="Comment">// and writing the entire array</span>
 <span id="L457" class="LineNr">457 </span>  write_products =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L458" class="LineNr">458 </span>  vector&lt;<span class="Normal">double</span>&gt; value = read_memory<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
 <span id="L459" class="LineNr">459 </span>  <span class="Comment">// Write Memory in PUT_INDEX in Run</span>
 <span id="L460" class="LineNr">460 </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#L141'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L461" class="LineNr">461 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; address+i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L461" class="LineNr">461 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; address+i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L462" class="LineNr">462 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address+i<span class="Delimiter">,</span> value<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L463" class="LineNr">463 </span>  <span class="Delimiter">}</span>
 <span id="L464" class="LineNr">464 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -570,13 +570,13 @@ if ('onhashchange' in window) {
 <span id="L506" class="LineNr">506 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L507" class="LineNr">507 </span><span class="Normal">case</span> LENGTH: <span class="Delimiter">{</span>
 <span id="L508" class="LineNr">508 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L509" class="LineNr">509 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'length' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L509" class="LineNr">509 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'length' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L510" class="LineNr">510 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L511" class="LineNr">511 </span>  <span class="Delimiter">}</span>
 <span id="L512" class="LineNr">512 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> array = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L513" class="LineNr">513 </span>  <span class="Comment">// Update LENGTH array in Check</span>
 <span id="L514" class="LineNr">514 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_array<span class="Delimiter">(</span>array<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L515" class="LineNr">515 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to calculate length of non-array '&quot;</span> &lt;&lt; array<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L515" class="LineNr">515 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to calculate length of non-array '&quot;</span> &lt;&lt; array<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L516" class="LineNr">516 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L517" class="LineNr">517 </span>  <span class="Delimiter">}</span>
 <span id="L518" class="LineNr">518 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -586,7 +586,7 @@ if ('onhashchange' in window) {
 <span id="L522" class="LineNr">522 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> array = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L523" class="LineNr">523 </span>  <span class="Comment">// Update LENGTH array in Run</span>
 <span id="L524" class="LineNr">524 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>array<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L525" class="LineNr">525 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L525" class="LineNr">525 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index 7dc49376..8b618e76 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -151,28 +151,28 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span><span class="Normal">case</span> MAYBE_CONVERT: <span class="Delimiter">{</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'maybe-convert' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'maybe-convert' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// Update MAYBE_CONVERT base in Check</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'maybe-convert' should be an exclusive-container, but got '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'maybe-convert' should be an exclusive-container, but got '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Identifier">break</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">const</span> type_tree* base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span>  <span class="Comment">// Update MAYBE_CONVERT base_type in Check</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_type<span class="Delimiter">-&gt;</span>atom || base_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L181'>EXCLUSIVE_CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'maybe-convert' should be an exclusive-container, but got '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'maybe-convert' should be an exclusive-container, but got '&quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Delimiter">}</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'maybe-convert' should have type 'variant', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'maybe-convert' should have type 'variant', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'maybe-convert' expects exactly 2 products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'maybe-convert' expects exactly 2 products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L112" class="LineNr">112 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Delimiter">}</span>
 <span id="L114" class="LineNr">114 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> product = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -180,18 +180,18 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span>  reagent&amp; offset = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>  <a href='012transform.cc.html#L91'>populate_value</a><span class="Delimiter">(</span>offset<span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset<span class="Delimiter">.</span>value &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>elements<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid tag &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid tag &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<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 class="Normal">const</span> reagent&amp; variant = variant_type<span class="Delimiter">(</span>base<span class="Delimiter">,</span> offset<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>product<span class="Delimiter">,</span> variant<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'maybe-convert &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>product<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'maybe-convert &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>product<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> status = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L128" class="LineNr">128 </span>  <span class="Comment">// Update MAYBE_CONVERT status in Check</span>
 <span id="L129" class="LineNr">129 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_boolean<span class="Delimiter">(</span>status<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L130" class="LineNr">130 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second product yielded by 'maybe-convert' should be a boolean, but tried to write to '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second product yielded by 'maybe-convert' should be a boolean, but tried to write to '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -202,7 +202,7 @@ if ('onhashchange' in window) {
 <span id="L138" class="LineNr">138 </span>  <span class="Comment">// Update MAYBE_CONVERT base in Run</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L140" class="LineNr">140 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L141" class="LineNr">141 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L141" class="LineNr">141 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L142" class="LineNr">142 </span>    <span class="Identifier">break</span><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">int</span> tag = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">;</span>
@@ -214,19 +214,19 @@ if ('onhashchange' in window) {
 <span id="L150" class="LineNr">150 </span>  write_products =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>tag == <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Normal">const</span> reagent&amp; variant = variant_type<span class="Delimiter">(</span>base<span class="Delimiter">,</span> tag<span class="Delimiter">);</span>
-<span id="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 1 in location &quot;</span> &lt;&lt; status<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 1 in location &quot;</span> &lt;&lt; status<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L154" class="LineNr">154 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> status<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L155" class="LineNr">155 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_dummy<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L156" class="LineNr">156 </span>      <span class="Comment">// Write Memory in Successful MAYBE_CONVERT in Run</span>
 <span id="L157" class="LineNr">157 </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; size_of<span class="Delimiter">(</span>variant<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L158" class="LineNr">158 </span>        <span class="Normal">double</span> val = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+i<span class="Delimiter">);</span>
-<span id="L159" class="LineNr">159 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>value+i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L159" class="LineNr">159 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>val<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>value+i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L160" class="LineNr">160 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> product<span class="Delimiter">.</span>value+i<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="L161" class="LineNr">161 </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="Delimiter">}</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; status<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; status<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L166" class="LineNr">166 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> status<span class="Delimiter">.</span>value<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Delimiter">}</span>
 <span id="L168" class="LineNr">168 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -369,22 +369,22 @@ if ('onhashchange' in window) {
 <span id="L305" class="LineNr">305 </span><span class="Delimiter">:(before &quot;End <a href='031merge.cc.html#L142'>check_merge_call</a> Special-cases&quot;)</span>
 <span id="L306" class="LineNr">306 </span><span class="Normal">case</span> <a href='010vm.cc.html#L181'>EXCLUSIVE_CONTAINER</a>: <span class="Delimiter">{</span>
 <span id="L307" class="LineNr">307 </span>  assert<span class="Delimiter">(</span>state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>top<span class="Delimiter">().</span>container_element_index == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L308" class="LineNr">308 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking exclusive container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L308" class="LineNr">308 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking exclusive container &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>container<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L309" class="LineNr">309 </span>  <span class="Comment">// easy case: exact match</span>
 <span id="L310" class="LineNr">310 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>types_strictly_match<span class="Delimiter">(</span>container<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span>
 <span id="L311" class="LineNr">311 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L312" class="LineNr">312 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr">313 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; of 'merge' should be a literal, for the tag of exclusive-container '&quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L313" class="LineNr">313 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; of 'merge' should be a literal, for the tag of exclusive-container '&quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L314" class="LineNr">314 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L315" class="LineNr">315 </span>  <span class="Delimiter">}</span>
 <span id="L316" class="LineNr">316 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> ingredient = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>ingredient_index<span class="Delimiter">);</span>  <span class="Comment">// unnecessary copy just to keep this function from modifying caller</span>
 <span id="L317" class="LineNr">317 </span>  <a href='012transform.cc.html#L91'>populate_value</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">);</span>
 <span id="L318" class="LineNr">318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient<span class="Delimiter">.</span>value &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>container_info<span class="Delimiter">.</span>elements<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid tag at &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; for '&quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid tag at &quot;</span> &lt;&lt; ingredient_index &lt;&lt; <span class="Constant">&quot; for '&quot;</span> &lt;&lt; container_info<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L320" class="LineNr">320 </span>    <span class="Identifier">return</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="Normal">const</span> reagent&amp; variant = variant_type<span class="Delimiter">(</span>container<span class="Delimiter">,</span> ingredient<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L323" class="LineNr">323 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;tag: &quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L323" class="LineNr">323 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;tag: &quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>value &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L324" class="LineNr">324 </span>  <span class="Comment">// replace union with its variant</span>
 <span id="L325" class="LineNr">325 </span>  state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>pop<span class="Delimiter">();</span>
 <span id="L326" class="LineNr">326 </span>  state<span class="Delimiter">.</span>data<span class="Delimiter">.</span>push<span class="Delimiter">(</span>merge_check_point<span class="Delimiter">(</span>variant<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">));</span>
diff --git a/html/034address.cc.html b/html/034address.cc.html
index 54a3172d..7080f375 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -163,25 +163,25 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span><span class="Normal">case</span> NEW: <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L103" class="LineNr">103 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'new' requires one or two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'new' requires one or two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Comment">// End NEW Check Special-cases</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Normal">const</span> reagent&amp; type = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_type_literal<span class="Delimiter">(</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'new' should be a type, but got '&quot;</span> &lt;&lt; type<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'new' should be a type, but got '&quot;</span> &lt;&lt; type<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'new' should be a number (array length), but got '&quot;</span> &lt;&lt; type<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'new' should be a number (array length), but got '&quot;</span> &lt;&lt; type<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L117" class="LineNr">117 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result of 'new' should never be ignored</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L117" class="LineNr">117 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result of 'new' should never be ignored</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L118" class="LineNr">118 </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>  <span class="Normal">if</span> <span class="Delimiter">(</span>!product_of_new_is_valid<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'new' has incorrect type: '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'new' has incorrect type: '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L122" class="LineNr">122 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Delimiter">}</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -206,7 +206,7 @@ if ('onhashchange' in window) {
 <span id="L143" class="LineNr">143 </span><span class="Normal">void</span> drop_from_type<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">,</span> string expected_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L144" class="LineNr">144 </span>  assert<span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L145" class="LineNr">145 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>name != expected_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't drop2 &quot;</span> &lt;&lt; expected_type &lt;&lt; <span class="Constant">&quot; from '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L146" class="LineNr">146 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't drop2 &quot;</span> &lt;&lt; expected_type &lt;&lt; <span class="Constant">&quot; from '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L147" class="LineNr">147 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Delimiter">}</span>
 <span id="L149" class="LineNr">149 </span>  <span class="Comment">// r.type = r.type-&gt;right</span>
@@ -264,12 +264,12 @@ if ('onhashchange' in window) {
 <span id="L201" class="LineNr">201 </span><span class="Comment">//: instructions left after the transforms have run.</span>
 <span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L203" class="LineNr">203 </span><span class="Normal">case</span> ALLOCATE: <span class="Delimiter">{</span>
-<span id="L204" class="LineNr">204 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;never call 'allocate' directly'; always use 'new'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L204" class="LineNr">204 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;never call 'allocate' directly'; always use 'new'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Identifier">break</span><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">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L208" class="LineNr">208 </span><span class="Normal">case</span> NEW: <span class="Delimiter">{</span>
-<span id="L209" class="LineNr">209 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;no implementation for 'new'; why wasn't it translated to 'allocate'? Please save a copy of your program and send it to Kartik.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L209" class="LineNr">209 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;no implementation for 'new'; why wasn't it translated to 'allocate'? Please save a copy of your program and send it to Kartik.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L210" class="LineNr">210 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L211" class="LineNr">211 </span><span class="Delimiter">}</span>
 <span id="L212" class="LineNr">212 </span>
@@ -278,7 +278,7 @@ if ('onhashchange' in window) {
 <span id="L215" class="LineNr">215 </span>
 <span id="L216" class="LineNr">216 </span><span class="Delimiter">:(code)</span>
 <span id="L217" class="LineNr">217 </span><span class="Normal">void</span> transform_new_to_allocate<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- convert 'new' to 'allocate' for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L218" class="LineNr">218 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- convert 'new' to 'allocate' for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <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#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L220" class="LineNr">220 </span>    instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L221" class="LineNr">221 </span>    <span class="Comment">// Convert 'new' To 'allocate'</span>
@@ -287,7 +287,7 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span>      inst<span class="Delimiter">.</span>operation = ALLOCATE<span class="Delimiter">;</span>
 <span id="L225" class="LineNr">225 </span>      type_tree* type = <a href='019type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">);</span>
 <span id="L226" class="LineNr">226 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>type<span class="Delimiter">));</span>
-<span id="L227" class="LineNr">227 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;size of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;size of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L228" class="LineNr">228 </span>      <span class="Normal">delete</span> type<span class="Delimiter">;</span>
 <span id="L229" class="LineNr">229 </span>    <span class="Delimiter">}</span>
 <span id="L230" class="LineNr">230 </span>  <span class="Delimiter">}</span>
@@ -308,7 +308,7 @@ if ('onhashchange' in window) {
 <span id="L245" class="LineNr">245 </span>alloc = Memory_allocated_until<span class="Delimiter">;</span>
 <span id="L246" class="LineNr">246 </span>Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span>
 <span id="L247" class="LineNr">247 </span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span>
-<span id="L248" class="LineNr">248 </span><a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; alloc_max &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span><a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; alloc_max &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L249" class="LineNr">249 </span>
 <span id="L250" class="LineNr">250 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L251" class="LineNr">251 </span>ALLOCATE<span class="Delimiter">,</span>
@@ -322,16 +322,16 @@ if ('onhashchange' in window) {
 <span id="L259" class="LineNr">259 </span>  Next_alloc_id++<span class="Delimiter">;</span>
 <span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L261" class="LineNr">261 </span>    <span class="Comment">// array allocation</span>
-<span id="L262" class="LineNr">262 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;array length is &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L262" class="LineNr">262 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;array length is &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L263" class="LineNr">263 </span>    size = <span class="Comment">/*</span><span class="Comment">space for length</span><span class="Comment">*/</span><span class="Constant">1</span> + size*ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L264" class="LineNr">264 </span>  <span class="Delimiter">}</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Normal">int</span> result = allocate<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
 <span id="L266" class="LineNr">266 </span>  <span class="Comment">// initialize alloc-id in payload</span>
-<span id="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing alloc-id &quot;</span> &lt;&lt; alloc_id &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing alloc-id &quot;</span> &lt;&lt; alloc_id &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L268" class="LineNr">268 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result<span class="Delimiter">,</span> alloc_id<span class="Delimiter">);</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L270" class="LineNr">270 </span>    <span class="Comment">// initialize array length</span>
-<span id="L271" class="LineNr">271 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing array length &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; result+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing array length &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; result+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L272" class="LineNr">272 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
 <span id="L274" class="LineNr">274 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
@@ -343,7 +343,7 @@ if ('onhashchange' in window) {
 <span id="L280" class="LineNr">280 </span><span class="Normal">int</span> allocate<span class="Delimiter">(</span><span class="Normal">int</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Comment">// include space for alloc id</span>
 <span id="L282" class="LineNr">282 </span>  ++size<span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;allocating size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L283" class="LineNr">283 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;allocating size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L284" class="LineNr">284 </span><span class="CommentedCode">//?   Total_alloc += size;</span>
 <span id="L285" class="LineNr">285 </span><span class="CommentedCode">//?   ++Num_alloc;</span>
 <span id="L286" class="LineNr">286 </span>  <span class="Comment">// Allocate Special-cases</span>
@@ -351,10 +351,10 @@ if ('onhashchange' in window) {
 <span id="L288" class="LineNr">288 </span>  <span class="Comment">// really crappy at the moment</span>
 <span id="L289" class="LineNr">289 </span>  ensure_space<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Normal">const</span> <span class="Normal">int</span> result = Current_routine<span class="Delimiter">-&gt;</span>alloc<span class="Delimiter">;</span>
-<span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L292" class="LineNr">292 </span>  <span class="Comment">// initialize allocated space</span>
 <span id="L293" class="LineNr">293 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L101'>address</a> = result<span class="Delimiter">;</span>  <a href='043space.cc.html#L101'>address</a> &lt; result+size<span class="Delimiter">;</span>  ++address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L294" class="LineNr">294 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0 in location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L295" class="LineNr">295 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
 <span id="L297" class="LineNr">297 </span>  Current_routine<span class="Delimiter">-&gt;</span>alloc += size<span class="Delimiter">;</span>
@@ -388,7 +388,7 @@ if ('onhashchange' in window) {
 <span id="L325" class="LineNr">325 </span>    Current_routine<span class="Delimiter">-&gt;</span>alloc = Memory_allocated_until<span class="Delimiter">;</span>
 <span id="L326" class="LineNr">326 </span>    Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span>
 <span id="L327" class="LineNr">327 </span>    Current_routine<span class="Delimiter">-&gt;</span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc_max &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L328" class="LineNr">328 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;new&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;routine allocated memory from &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc_max &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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>
@@ -477,17 +477,17 @@ if ('onhashchange' in window) {
 <span id="L414" class="LineNr">414 </span>  <span class="Comment">// primary goal of these checks is to forbid address arithmetic</span>
 <span id="L415" class="LineNr">415 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L416" class="LineNr">416 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L417" class="LineNr">417 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'deaddress' requires <a href='043space.cc.html#L101'>address</a> ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L417" class="LineNr">417 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'deaddress' requires <a href='043space.cc.html#L101'>address</a> ingredients, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L418" class="LineNr">418 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L419" class="LineNr">419 </span>    <span class="Delimiter">}</span>
 <span id="L420" class="LineNr">420 </span>  <span class="Delimiter">}</span>
 <span id="L421" class="LineNr">421 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> &gt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L422" class="LineNr">422 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L422" class="LineNr">422 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;too many products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L423" class="LineNr">423 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L424" class="LineNr">424 </span>  <span class="Delimiter">}</span>
 <span id="L425" class="LineNr">425 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L426" class="LineNr">426 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_real_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L427" class="LineNr">427 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'deaddress' requires number products, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L427" class="LineNr">427 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'deaddress' requires number products, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L428" class="LineNr">428 </span>      <span class="Identifier">goto</span> finish_checking_instruction<span class="Delimiter">;</span>
 <span id="L429" class="LineNr">429 </span>    <span class="Delimiter">}</span>
 <span id="L430" class="LineNr">430 </span>  <span class="Delimiter">}</span>
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index 1bf9d7e2..97957855 100644
--- a/html/035lookup.cc.html
+++ b/html/035lookup.cc.html
@@ -137,13 +137,13 @@ if ('onhashchange' in window) {
 <span id="L72" class="LineNr"> 72 </span>
 <span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> <a href='035lookup.cc.html#L73'>lookup_memory</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value != Address_type_ordinal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' but it isn't an address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L75" class="LineNr"> 75 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' but it isn't an address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L76" class="LineNr"> 76 </span>    dump_callstack<span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Comment">// compute value</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>    dump_callstack<span class="Delimiter">();</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
@@ -153,15 +153,15 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span><span class="Normal">void</span> <a href='035lookup.cc.html#L88'>lookup_memory_core</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">bool</span> check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Normal">double</span> <a href='043space.cc.html#L101'>address</a> = x<span class="Delimiter">.</span>value + <span class="Comment">/*</span><span class="Comment">skip alloc id in <a href='043space.cc.html#L101'>address</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Normal">double</span> new_value = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <span class="Constant">&quot; contains &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>new_value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <span class="Constant">&quot; contains &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>new_value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Comment">// check for null</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>check_for_null &amp;&amp; new_value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L96" class="LineNr"> 96 </span>      dump_callstack<span class="Delimiter">();</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Delimiter">}</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>    <span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Comment">// validate alloc-id</span>
@@ -169,7 +169,7 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span>  <span class="Normal">double</span> alloc_id_in_payload = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_value<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span><span class="CommentedCode">//?   cerr &lt;&lt; x.value &lt;&lt; &quot;: &quot; &lt;&lt; alloc_id_in_address &lt;&lt; &quot; vs &quot; &lt;&lt; new_value &lt;&lt; &quot;: &quot; &lt;&lt; alloc_id_in_payload &lt;&lt; '\n';</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>alloc_id_in_address != alloc_id_in_payload<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;address is already abandoned in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;address is already abandoned in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L108" class="LineNr">108 </span>      dump_callstack<span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Comment">// all well; complete the lookup</span>
@@ -216,7 +216,7 @@ if ('onhashchange' in window) {
 <span id="L151" class="LineNr">151 </span><span class="Normal">bool</span> canonize_type<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</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>!r<span class="Delimiter">.</span>type || r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || !r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left || !r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom || r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value != Address_type_ordinal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;cannot perform lookup on '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' because it has non-address type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;cannot perform lookup on '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' because it has non-address type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L155" class="LineNr">155 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span>    <span class="Delimiter">}</span>
 <span id="L157" class="LineNr">157 </span>    drop_from_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
@@ -226,7 +226,7 @@ if ('onhashchange' in window) {
 <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="Normal">void</span> drop_one_lookup<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt;::iterator p = r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt;::iterator p = r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L165" class="LineNr">165 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first == <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L166" class="LineNr">166 </span>      r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L167" class="LineNr">167 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -317,7 +317,7 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> i = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L253" class="LineNr">253 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
 <span id="L254" class="LineNr">254 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>p<span class="Delimiter">,</span> i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L255" class="LineNr">255 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L256" class="LineNr">256 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
 <span id="L258" class="LineNr">258 </span>
@@ -432,7 +432,7 @@ if ('onhashchange' in window) {
 <span id="L367" class="LineNr">367 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> i = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L368" class="LineNr">368 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
 <span id="L369" class="LineNr">369 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>p<span class="Delimiter">,</span> i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put-index' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put-index' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L371" class="LineNr">371 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L372" class="LineNr">372 </span><span class="Delimiter">}</span>
 <span id="L373" class="LineNr">373 </span>
@@ -561,7 +561,7 @@ if ('onhashchange' in window) {
 <span id="L496" class="LineNr">496 </span>    properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L497" class="LineNr">497 </span>  <span class="Delimiter">}</span>
 <span id="L498" class="LineNr">498 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L499" class="LineNr">499 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal name '&quot;</span> &lt;&lt; original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L499" class="LineNr">499 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal name '&quot;</span> &lt;&lt; original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="SalientComment">//:: helpers for debugging</span>
diff --git a/html/036abandon.cc.html b/html/036abandon.cc.html
index 8a83f759..90068580 100644
--- a/html/036abandon.cc.html
+++ b/html/036abandon.cc.html
@@ -99,12 +99,12 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Normal">case</span> ABANDON: <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'abandon' shouldn't write to any products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'abandon' shouldn't write to any products in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Delimiter">}</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Normal">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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L44" class="LineNr"> 44 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredients of 'abandon' should be addresses, but ingredient &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredients of 'abandon' should be addresses, but ingredient &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">}</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -130,7 +130,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr = address+<span class="Constant">1</span><span class="Delimiter">;</span>  curr &lt; address+payload_size<span class="Delimiter">;</span>  ++curr<span class="Delimiter">)</span>
 <span id="L68" class="LineNr"> 68 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Comment">// append existing free list to address</span>
-<span id="L70" class="LineNr"> 70 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;saving &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <span class="Constant">&quot; in free-list of size &quot;</span> &lt;&lt; <a href='036abandon.cc.html#L75'>payload_size</a> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;saving &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <span class="Constant">&quot; in free-list of size &quot;</span> &lt;&lt; <a href='036abandon.cc.html#L75'>payload_size</a> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address+<span class="Comment">/*</span><span class="Comment">skip invalid alloc-id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036abandon.cc.html#L75'>payload_size</a><span class="Delimiter">));</span>
 <span id="L72" class="LineNr"> 72 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> <a href='036abandon.cc.html#L75'>payload_size</a><span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">);</span>
 <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">}</span>
@@ -143,9 +143,9 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span>
 <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(after &quot;Allocate Special-cases&quot;)</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> size<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;picking up space from free-list of size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L83" class="LineNr"> 83 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;abandon&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;picking up space from free-list of size &quot;</span> &lt;&lt; size &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Normal">int</span> result = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc from free list: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L85" class="LineNr"> 85 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new alloc from free list: &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>free_list<span class="Delimiter">,</span> size<span class="Delimiter">,</span> <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">));</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Comment">// clear 'deleted' tag</span>
 <span id="L88" class="LineNr"> 88 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
@@ -153,7 +153,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> curr = result<span class="Delimiter">;</span>  curr &lt; result+size<span class="Delimiter">;</span>  ++curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;memory in free list was not zeroed out: &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;; somebody wrote to us after free!!!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;memory in free list was not zeroed out: &quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; result &lt;&lt; <span class="Constant">&quot;; somebody wrote to us after free!!!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// always fatal</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Delimiter">}</span>
diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html
index d3657fc1..6a575b04 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -95,7 +95,7 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span>    products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">alloc id</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L33" class="LineNr"> 33 </span>    products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><a href='038new_text.cc.html#L39'>new_mu_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new string alloc: &quot;</span> &lt;&lt; products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new string alloc: &quot;</span> &lt;&lt; products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L37" class="LineNr"> 37 </span>
@@ -108,7 +108,7 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">int</span> result = allocate<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span> + string_length<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">int</span> curr_address = result<span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  ++curr_address<span class="Delimiter">;</span>  <span class="Comment">// skip alloc id</span>
-<span id="L47" class="LineNr"> 47 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string length &quot;</span> &lt;&lt; string_length &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string length &quot;</span> &lt;&lt; string_length &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> string_length<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>  ++curr_address<span class="Delimiter">;</span>  <span class="Comment">// skip length</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Normal">int</span> curr = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -117,7 +117,7 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span>    <span class="Normal">uint32_t</span> curr_character<span class="Delimiter">;</span>
 <span id="L54" class="LineNr"> 54 </span>    assert<span class="Delimiter">(</span>curr &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">));</span>
 <span id="L55" class="LineNr"> 55 </span>    tb_utf8_char_to_unicode<span class="Delimiter">(</span>&amp;curr_character<span class="Delimiter">,</span> &amp;raw_contents[curr]<span class="Delimiter">);</span>
-<span id="L56" class="LineNr"> 56 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing string character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> curr_character<span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span>    curr += tb_utf8_char_length<span class="Delimiter">(</span>raw_contents[curr]<span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>    ++curr_address<span class="Delimiter">;</span>
@@ -243,15 +243,15 @@ if ('onhashchange' in window) {
 <span id="L179" class="LineNr">179 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L180" class="LineNr">180 </span><span class="Normal">case</span> ASSERT: <span class="Delimiter">{</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'assert' takes exactly two ingredients rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'assert' takes exactly two ingredients rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L183" class="LineNr">183 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L184" class="LineNr">184 </span>  <span class="Delimiter">}</span>
 <span id="L185" class="LineNr">185 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_address<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_scalar<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'assert' requires a scalar or <a href='043space.cc.html#L101'>address</a> for its first ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'assert' requires a scalar or <a href='043space.cc.html#L101'>address</a> for its first ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L187" class="LineNr">187 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L188" class="LineNr">188 </span>  <span class="Delimiter">}</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &amp;&amp; !is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr">190 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'assert' requires a text as its second ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L190" class="LineNr">190 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'assert' requires a text as its second ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L191" class="LineNr">191 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L192" class="LineNr">192 </span>  <span class="Delimiter">}</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -260,9 +260,9 @@ if ('onhashchange' in window) {
 <span id="L196" class="LineNr">196 </span><span class="Normal">case</span> ASSERT: <span class="Delimiter">{</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!scalar_ingredient<span class="Delimiter">(</span>ingredients<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L198" class="LineNr">198 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span>
-<span id="L199" class="LineNr">199 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L199" class="LineNr">199 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L200" class="LineNr">200 </span>    <span class="Normal">else</span>
-<span id="L201" class="LineNr">201 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='038new_text.cc.html#L142'>read_mu_text</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L201" class="LineNr">201 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='038new_text.cc.html#L142'>read_mu_text</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L202" class="LineNr">202 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L203" class="LineNr">203 </span>  <span class="Delimiter">}</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/040brace.cc.html b/html/040brace.cc.html
index de32c045..79eb6f63 100644
--- a/html/040brace.cc.html
+++ b/html/040brace.cc.html
@@ -101,15 +101,15 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">const</span> <span class="Normal">bool</span> OPEN =<span class="Constant"> false</span><span class="Delimiter">,</span> CLOSE =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Comment">// use signed integer for step index because we'll be doing arithmetic on it</span>
 <span id="L41" class="LineNr"> 41 </span>  list&lt;pair&lt;<span class="Normal">bool</span><span class="Comment">/*</span><span class="Comment">OPEN/CLOSE</span><span class="Comment">*/</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">step</span><span class="Comment">*/</span><span class="Normal">int</span>&gt; &gt; braces<span class="Delimiter">;</span>
-<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- <a href='012transform.cc.html#L99'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- <a href='012transform.cc.html#L99'>transform</a> braces for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="Normal">const</span> instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>label == <span class="Constant">&quot;{&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push (open, &quot;</span> &lt;&lt; index &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push (open, &quot;</span> &lt;&lt; index &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>      braces<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;<span class="Normal">bool</span><span class="Delimiter">,</span><span class="Normal">int</span>&gt;<span class="Delimiter">(</span>OPEN<span class="Delimiter">,</span> index<span class="Delimiter">));</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Delimiter">}</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>label == <span class="Constant">&quot;}&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push (close, &quot;</span> &lt;&lt; index &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push (close, &quot;</span> &lt;&lt; index &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L51" class="LineNr"> 51 </span>      braces<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;<span class="Normal">bool</span><span class="Delimiter">,</span><span class="Normal">int</span>&gt;<span class="Delimiter">(</span>CLOSE<span class="Delimiter">,</span> index<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>
@@ -122,7 +122,7 @@ if ('onhashchange' in window) {
 <span id="L60" class="LineNr"> 60 </span>    <span class="Delimiter">}</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>label == <span class="Constant">&quot;}&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L62" class="LineNr"> 62 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L63" class="LineNr"> 63 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unbalanced '}'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unbalanced '}'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L64" class="LineNr"> 64 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L65" class="LineNr"> 65 </span>      <span class="Delimiter">}</span>
 <span id="L66" class="LineNr"> 66 </span>      open_braces<span class="Delimiter">.</span>pop<span class="Delimiter">();</span>
@@ -135,13 +135,13 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;break&quot;</span>
 <span id="L74" class="LineNr"> 74 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;break-if&quot;</span>
 <span id="L75" class="LineNr"> 75 </span>         &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;break-unless&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L76" class="LineNr"> 76 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; ...&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; ...&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>    <span class="Comment">// check for errors</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos || inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L81" class="LineNr"> 81 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L82" class="LineNr"> 82 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' expects 1 or 2 ingredients, but got none</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' expects 1 or 2 ingredients, but got none</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L83" class="LineNr"> 83 </span>        <span class="Identifier">continue</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>
@@ -163,14 +163,14 @@ if ('onhashchange' in window) {
 <span id="L101" class="LineNr">101 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-if&quot;</span><span class="Delimiter">)</span> != string::npos || inst<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;-unless&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L102" class="LineNr">102 </span>      <span class="Comment">// conditional branches check arg 1</span>
 <span id="L103" class="LineNr">103 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span> &amp;&amp; is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L104" class="LineNr">104 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
 <span id="L105" class="LineNr">105 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>      <span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>    <span class="Delimiter">}</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L109" class="LineNr">109 </span>      <span class="Comment">// unconditional branches check arg 0</span>
 <span id="L110" class="LineNr">110 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L111" class="LineNr">111 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L111" class="LineNr">111 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
 <span id="L112" class="LineNr">112 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>      <span class="Delimiter">}</span>
 <span id="L114" class="LineNr">114 </span>    <span class="Delimiter">}</span>
@@ -178,7 +178,7 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span>    reagent target<span class="Delimiter">(</span><span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;offset&quot;</span><span class="Delimiter">));</span>
 <span id="L117" class="LineNr">117 </span>    target<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L119" class="LineNr">119 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; old_name &lt;&lt; <span class="Constant">&quot;' needs a '{' before</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; old_name &lt;&lt; <span class="Constant">&quot;' needs a '{' before</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>old_name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;loop&quot;</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span>
 <span id="L121" class="LineNr">121 </span>      target<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span>open_braces<span class="Delimiter">.</span>top<span class="Delimiter">()</span>-index<span class="Delimiter">);</span>
 <span id="L122" class="LineNr">122 </span>    <span class="Normal">else</span>  <span class="Comment">// break instruction</span>
@@ -186,9 +186,9 @@ if ('onhashchange' in window) {
 <span id="L124" class="LineNr">124 </span>    inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>target<span class="Delimiter">);</span>
 <span id="L125" class="LineNr">125 </span>    <span class="Comment">// log computed target</span>
 <span id="L126" class="LineNr">126 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;jump&quot;</span><span class="Delimiter">)</span>
-<span id="L127" class="LineNr">127 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L127" class="LineNr">127 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
 <span id="L128" class="LineNr">128 </span>    <span class="Normal">else</span>
-<span id="L129" class="LineNr">129 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
+<span id="L129" class="LineNr">129 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>target<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;:offset</span><span class="Constant">&quot; &lt;&lt; end();</span>
 <span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>
@@ -196,12 +196,12 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span><span class="Comment">// enable future signed arithmetic</span>
 <span id="L135" class="LineNr">135 </span><span class="Normal">int</span> <a href='040brace.cc.html#L135'>matching_brace</a><span class="Delimiter">(</span><span class="Normal">int</span> index<span class="Delimiter">,</span> <span class="Normal">const</span> list&lt;pair&lt;<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;&amp; braces<span class="Delimiter">,</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">int</span> stacksize = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;pair&lt;<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;::const_iterator p = braces<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != braces<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;pair&lt;<span class="Normal">bool</span><span class="Delimiter">,</span> <span class="Normal">int</span>&gt; &gt;::const_iterator p = braces<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != braces<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L138" class="LineNr">138 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second &lt; index<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span>    stacksize += <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first ? <span class="Constant">1</span> : -<span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>stacksize == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L141" class="LineNr">141 </span>  <span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unbalanced '{'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L142" class="LineNr">142 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unbalanced '{'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  <span class="Comment">// exit current routine</span>
 <span id="L144" class="LineNr">144 </span><span class="Delimiter">}</span>
 <span id="L145" class="LineNr">145 </span>
@@ -458,7 +458,7 @@ if ('onhashchange' in window) {
 <span id="L396" class="LineNr">396 </span>    curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L397" class="LineNr">397 </span>  <span class="Delimiter">}</span>
 <span id="L398" class="LineNr">398 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L399" class="LineNr">399 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L399" class="LineNr">399 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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 class="Comment">// rewrite 'return-unless a, b, c, ...' to</span>
@@ -474,7 +474,7 @@ if ('onhashchange' in window) {
 <span id="L412" class="LineNr">412 </span>    curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L413" class="LineNr">413 </span>  <span class="Delimiter">}</span>
 <span id="L414" class="LineNr">414 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L415" class="LineNr">415 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L415" class="LineNr">415 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' never yields any products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L416" class="LineNr">416 </span>  <span class="Delimiter">}</span>
 <span id="L417" class="LineNr">417 </span><span class="Delimiter">}</span>
 <span id="L418" class="LineNr">418 </span>
@@ -483,7 +483,7 @@ if ('onhashchange' in window) {
 <span id="L421" class="LineNr">421 </span>  <span class="Normal">const</span> vector&lt;reagent&gt;&amp; ingredients = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">;</span>
 <span id="L422" class="LineNr">422 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> condition = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L423" class="LineNr">423 </span>  vector&lt;reagent&gt; return_ingredients<span class="Delimiter">;</span>
-<span id="L424" class="LineNr">424 </span>  copy<span class="Delimiter">(</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>return_ingredients<span class="Delimiter">,</span> return_ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()));</span>
+<span id="L424" class="LineNr">424 </span>  copy<span class="Delimiter">(</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>return_ingredients<span class="Delimiter">,</span> return_ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()));</span>
 <span id="L425" class="LineNr">425 </span>
 <span id="L426" class="LineNr">426 </span>  <span class="Comment">// {</span>
 <span id="L427" class="LineNr">427 </span>  <a href='010vm.cc.html#L33'>instruction</a> open_label<span class="Delimiter">;</span>  open_label<span class="Delimiter">.</span>is_label=<span class="Constant">true</span><span class="Delimiter">;</span>  open_label<span class="Delimiter">.</span>label = <span class="Constant">&quot;{&quot;</span><span class="Delimiter">;</span>
diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html
index 5b59380d..1984b251 100644
--- a/html/041jump_target.cc.html
+++ b/html/041jump_target.cc.html
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr"> 39 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>offset<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">,</span> i<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>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;duplicate label '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>label &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;duplicate label '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>label &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L43" class="LineNr"> 43 </span>        <span class="Comment">// have all jumps skip some random but noticeable and deterministic amount of code</span>
 <span id="L44" class="LineNr"> 44 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>offset<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">,</span> <span class="Constant">9999</span><span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>      <span class="Delimiter">}</span>
@@ -112,14 +112,14 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span>    instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;jump&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>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L52" class="LineNr"> 52 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' expects an ingredient but got 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' expects an ingredient but got 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L54" class="LineNr"> 54 </span>      <span class="Delimiter">}</span>
 <span id="L55" class="LineNr"> 55 </span>      <a href='041jump_target.cc.html#L76'>replace_offset</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> offset<span class="Delimiter">,</span> i<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="Delimiter">}</span>
 <span id="L57" class="LineNr"> 57 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;jump-if&quot;</span> || inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;jump-unless&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L58" class="LineNr"> 58 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' expects 2 ingredients but got &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' expects 2 ingredients but got &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L60" class="LineNr"> 60 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L61" class="LineNr"> 61 </span>      <span class="Delimiter">}</span>
 <span id="L62" class="LineNr"> 62 </span>      <a href='041jump_target.cc.html#L76'>replace_offset</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> offset<span class="Delimiter">,</span> i<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
@@ -138,19 +138,19 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span>
 <span id="L76" class="LineNr"> 76 </span><span class="Normal">void</span> <a href='041jump_target.cc.html#L76'>replace_offset</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; offset<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">int</span> current_offset<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump target must be offset or label but is '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump target must be offset or label but is '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L79" class="LineNr"> 79 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</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>x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// non-labels will be handled like other number operands</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_jump_target<span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't jump to label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't jump to label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="Identifier">return</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>!contains_key<span class="Delimiter">(</span>offset<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't find label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't find label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L91" class="LineNr"> 91 </span>    x<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// no jump by default</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>
diff --git a/html/042name.cc.html b/html/042name.cc.html
index 7225cdb2..7e39fa20 100644
--- a/html/042name.cc.html
+++ b/html/042name.cc.html
@@ -100,7 +100,7 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(code)</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Normal">void</span> <a href='042name.cc.html#L37'>transform_names</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L39" class="LineNr"> 39 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- <a href='012transform.cc.html#L99'>transform</a> names for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- <a href='012transform.cc.html#L99'>transform</a> names for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </span>  <span class="Normal">bool</span> names_used =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">bool</span> numeric_locations_used =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L42" class="LineNr"> 42 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;&amp; names = Name[r]<span class="Delimiter">;</span>
@@ -121,7 +121,7 @@ if ('onhashchange' in window) {
 <span id="L57" class="LineNr"> 57 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L164'>is_named_location</a><span class="Delimiter">(</span>ingredient<span class="Delimiter">))</span> names_used =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L58" class="LineNr"> 58 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>ingredient<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L59" class="LineNr"> 59 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!already_transformed<span class="Delimiter">(</span>ingredient<span class="Delimiter">,</span> names<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L60" class="LineNr"> 60 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;tried to read ingredient '&quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' but it hasn't been written to yet</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;tried to read ingredient '&quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' but it hasn't been written to yet</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L61" class="LineNr"> 61 </span>        <span class="Comment">// use-before-set Error</span>
 <span id="L62" class="LineNr"> 62 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L63" class="LineNr"> 63 </span>      <span class="Delimiter">}</span>
@@ -131,7 +131,7 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>        <span class="Comment">// Done Placing Ingredient(ingredient, inst, caller)</span>
 <span id="L68" class="LineNr"> 68 </span>      <span class="Delimiter">}</span>
 <span id="L69" class="LineNr"> 69 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L70" class="LineNr"> 70 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't find a place to store '&quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't find a place to store '&quot;</span> &lt;&lt; ingredient<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>        <span class="Identifier">return</span><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>
@@ -141,8 +141,8 @@ if ('onhashchange' in window) {
 <span id="L77" class="LineNr"> 77 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L157'>is_numeric_location</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> numeric_locations_used =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L164'>is_named_location</a><span class="Delimiter">(</span>product<span class="Delimiter">))</span> names_used =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L79" class="LineNr"> 79 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L80" class="LineNr"> 80 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">)</span> == names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;assign &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &quot;</span> &lt;&lt; curr_idx &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>product<span class="Delimiter">.</span>name<span class="Delimiter">)</span> == names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr"> 81 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;assign &quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &quot;</span> &lt;&lt; curr_idx &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>        names[product<span class="Delimiter">.</span>name] = curr_idx<span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>        curr_idx += size_of<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
 <span id="L84" class="LineNr"> 84 </span>      <span class="Delimiter">}</span>
@@ -152,18 +152,18 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>        <span class="Comment">// Done Placing Product(product, inst, caller)</span>
 <span id="L89" class="LineNr"> 89 </span>      <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L91" class="LineNr"> 91 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't find a place to store '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't find a place to store '&quot;</span> &lt;&lt; product<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&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="Delimiter">}</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>names_used &amp;&amp; numeric_locations_used<span class="Delimiter">)</span>
-<span id="L97" class="LineNr"> 97 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mixing variable names and numeric addresses</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mixing variable names and numeric addresses</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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">bool</span> <a href='042name.cc.html#L100'>is_disqualified</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">mutable</span><span class="Comment">*/</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>recipe_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>recipe_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>    <span class="Comment">// missing-type Error 1</span>
 <span id="L104" class="LineNr">104 </span>    <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
@@ -206,7 +206,7 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span>  <span class="Normal">const</span> type_info&amp; container = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">);</span>
 <span id="L143" class="LineNr">143 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>container<span class="Delimiter">.</span>elements<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L144" class="LineNr">144 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>container<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name == name<span class="Delimiter">)</span> <span class="Identifier">return</span> i<span class="Delimiter">;</span>
-<span id="L145" class="LineNr">145 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>recipe_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown element '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' in container '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L145" class="LineNr">145 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>recipe_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown element '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' in container '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> t<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L147" class="LineNr">147 </span><span class="Delimiter">}</span>
 <span id="L148" class="LineNr">148 </span><span class="Normal">int</span> <a href='042name.cc.html#L148'>find_element_location</a><span class="Delimiter">(</span><span class="Normal">int</span> base_address<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; name<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; recipe_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -316,7 +316,7 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span><span class="Delimiter">:(before &quot;End update GET offset_value in Check&quot;)</span>
 <span id="L253" class="LineNr">253 </span><span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L254" class="LineNr">254 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!offset<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L255" class="LineNr">255 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;uninitialized offset '&quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;uninitialized offset '&quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L256" class="LineNr">256 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L257" class="LineNr">257 </span>  <span class="Delimiter">}</span>
 <span id="L258" class="LineNr">258 </span>  offset_value = offset<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
@@ -346,7 +346,7 @@ if ('onhashchange' in window) {
 <span id="L282" class="LineNr">282 </span>    <a href='010vm.cc.html#L125'>type_ordinal</a> base_type = <a href='042name.cc.html#L121'>skip_addresses</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">);</span>
 <span id="L283" class="LineNr">283 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
 <span id="L284" class="LineNr">284 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L141'>find_element_offset</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L285" class="LineNr">285 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;element &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is at offset &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L285" class="LineNr">285 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;element &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is at offset &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L286" class="LineNr">286 </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>
@@ -385,7 +385,7 @@ if ('onhashchange' in window) {
 <span id="L321" class="LineNr">321 </span><span class="Comment">// convert variant names of exclusive containers</span>
 <span id="L322" class="LineNr">322 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;maybe-convert&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exactly 2 ingredients expected in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L324" class="LineNr">324 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exactly 2 ingredients expected in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L325" class="LineNr">325 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L326" class="LineNr">326 </span>  <span class="Delimiter">}</span>
 <span id="L327" class="LineNr">327 </span>  assert<span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)));</span>
@@ -394,7 +394,7 @@ if ('onhashchange' in window) {
 <span id="L330" class="LineNr">330 </span>    <a href='010vm.cc.html#L125'>type_ordinal</a> base_type = <a href='042name.cc.html#L121'>skip_addresses</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">);</span>
 <span id="L331" class="LineNr">331 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// otherwise we'll raise an error elsewhere</span>
 <span id="L332" class="LineNr">332 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><a href='042name.cc.html#L141'>find_element_offset</a><span class="Delimiter">(</span>base_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L333" class="LineNr">333 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;variant &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; has tag &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L333" class="LineNr">333 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;variant &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; of type &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; has tag &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L334" class="LineNr">334 </span>    <span class="Delimiter">}</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Delimiter">}</span>
 <span id="L336" class="LineNr">336 </span><span class="Delimiter">}</span>
diff --git a/html/043space.cc.html b/html/043space.cc.html
index 2a235940..357016f5 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -151,7 +151,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='042name.cc.html#L179'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> || is_dummy<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>initialized<span class="Delimiter">)</span>
-<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;: reagent not initialized: '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;: reagent not initialized: '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L91" class="LineNr"> 91 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><a href='043space.cc.html#L101'>address</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>value<span class="Delimiter">,</span> space_base<span class="Delimiter">(</span>x<span class="Delimiter">)));</span>
 <span id="L92" class="LineNr"> 92 </span>  x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;raw&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L93" class="LineNr"> 93 </span>  assert<span class="Delimiter">(</span><a href='042name.cc.html#L179'>is_raw</a><span class="Delimiter">(</span>x<span class="Delimiter">));</span>
@@ -168,8 +168,8 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span>  <span class="Normal">int</span> size = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> base<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>offset &gt;= size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L106" class="LineNr">106 </span>    <span class="Comment">// todo: test</span>
-<span id="L107" class="LineNr">107 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: location &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is out of bounds &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; base &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L108" class="LineNr">108 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: location &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is out of bounds &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; base &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L108" class="LineNr">108 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
@@ -181,9 +181,9 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr">117 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
 <span id="L118" class="LineNr">118 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;default-space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L119" class="LineNr">119 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_space<span class="Delimiter">(</span>x<span class="Delimiter">))</span>
-<span id="L120" class="LineNr">120 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' should be of type <a href='043space.cc.html#L101'>address</a>:array:location, but is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L120" class="LineNr">120 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' should be of type <a href='043space.cc.html#L101'>address</a>:array:location, but is &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L122" class="LineNr">122 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' getting data from non-address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'default-space' getting data from non-address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L123" class="LineNr">123 </span>  <a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">().</span>default_space = data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L124" class="LineNr">124 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L125" class="LineNr">125 </span><span class="Delimiter">}</span>
@@ -293,12 +293,12 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span><span class="Delimiter">:(code)</span>
 <span id="L230" class="LineNr">230 </span><span class="Normal">void</span> <a href='043space.cc.html#L230'>rewrite_default_space_instruction</a><span class="Delimiter">(</span>instruction&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L231" class="LineNr">231 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L232" class="LineNr">232 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L232" class="LineNr">232 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' can't take any ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L233" class="LineNr">233 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new&quot;</span><span class="Delimiter">;</span>
 <span id="L234" class="LineNr">234 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;location:type</span><span class="Constant">&quot;));</span>
 <span id="L235" class="LineNr">235 </span>  <span class="Constant">curr.ingredients.push_back(reagent(&quot;number-of-locals:literal</span><span class="Constant">&quot;));</span>
 <span id="L236" class="LineNr">236 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L237" class="LineNr">237 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;local-scope can't take any results</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L237" class="LineNr">237 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;local-scope can't take any results</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L238" class="LineNr">238 </span>  curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span><span class="Constant">&quot;default-space:space&quot;</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="Delimiter">:(after &quot;Begin Preprocess read_memory(x)&quot;)</span>
@@ -306,12 +306,12 @@ if ('onhashchange' in window) {
 <span id="L242" class="LineNr">242 </span>  vector&lt;<span class="Normal">double</span>&gt; result<span class="Delimiter">;</span>
 <span id="L243" class="LineNr">243 </span>  result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span>][<span class="Constant">&quot;&quot;</span>]<span class="Delimiter">);</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>back<span class="Delimiter">()</span> == <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L245" class="LineNr">245 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;no space allocated for default-space in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; are you using names?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L245" class="LineNr">245 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;no space allocated for default-space in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;; are you using names?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>
 <span id="L248" class="LineNr">248 </span><span class="Delimiter">:(after &quot;Begin Preprocess write_memory(x, data)&quot;)</span>
 <span id="L249" class="LineNr">249 </span><span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>name == <span class="Constant">&quot;number-of-locals&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to special name 'number-of-locals'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L250" class="LineNr">250 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to special name 'number-of-locals'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L251" class="LineNr">251 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
 <span id="L253" class="LineNr">253 </span>
@@ -328,10 +328,10 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span>  <span class="Comment">// End check_default_space Special-cases</span>
 <span id="L265" class="LineNr">265 </span>  <span class="Comment">// assume recipes with only numeric addresses know what they're doing (usually tests)</span>
 <span id="L266" class="LineNr">266 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_non_special_name<span class="Delimiter">(</span>r<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check that <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; sets default-space&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check that <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; sets default-space&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L269" class="LineNr">269 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_by_setting_default_space<span class="Delimiter">(</span>caller<span class="Delimiter">))</span>
-<span id="L270" class="LineNr">270 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; does not seem to start with 'local-scope' or 'default-space'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; does not seem to start with 'local-scope' or 'default-space'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L271" class="LineNr">271 </span><span class="Delimiter">}</span>
 <span id="L272" class="LineNr">272 </span><span class="Normal">bool</span> <a href='043space.cc.html#L272'>starts_by_setting_default_space</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L273" class="LineNr">273 </span>  <span class="Identifier">return</span> !r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>empty<span class="Delimiter">()</span>
@@ -348,7 +348,7 @@ if ('onhashchange' in window) {
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(code)</span>
 <span id="L286" class="LineNr">286 </span><span class="Normal">bool</span> <a href='043space.cc.html#L286'>contains_non_special_name</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Name[r]<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Name[r]<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt;::iterator p = Name[r]<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Name[r]<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// generated by rewrite_stashes_to_text (cross-layer)</span>
 <span id="L290" class="LineNr">290 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_special_name<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index 16d5d48c..b07bb0f0 100644
--- a/html/044space_surround.cc.html
+++ b/html/044space_surround.cc.html
@@ -119,7 +119,7 @@ if ('onhashchange' in window) {
 <span id="L57" class="LineNr">57 </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#L141'>SIZE</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L58" class="LineNr">58 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>first == <span class="Constant">&quot;space&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L59" class="LineNr">59 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second || x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span>
-<span id="L60" class="LineNr">60 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;/space metadata should take exactly one value in '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L60" class="LineNr">60 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;/space metadata should take exactly one value in '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L61" class="LineNr">61 </span>      <span class="Identifier">return</span> to_integer<span class="Delimiter">(</span>x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>second<span class="Delimiter">-&gt;</span>value<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>
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index c72a8621..6dbc73c8 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -104,7 +104,7 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr"> 42 </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='045closure_name.cc.html#L44'>collect_surrounding_spaces</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- collect surrounding spaces for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- collect surrounding spaces for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </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#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="Normal">const</span> instruction&amp; inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -112,28 +112,28 @@ if ('onhashchange' in window) {
 <span id="L50" class="LineNr"> 50 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L51" class="LineNr"> 51 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>name != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L52" class="LineNr"> 52 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_space<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should always have type <a href='043space.cc.html#L101'>address</a>:array:location, but is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should always have type <a href='043space.cc.html#L101'>address</a>:array:location, but is '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L54" class="LineNr"> 54 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L55" class="LineNr"> 55 </span>      <span class="Delimiter">}</span>
 <span id="L56" class="LineNr"> 56 </span>      string_tree* s = property<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">);</span>
 <span id="L57" class="LineNr"> 57 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L58" class="LineNr"> 58 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 requires a /names property in <a href='010vm.cc.html#L19'>recipe</a> '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 requires a /names property in <a href='010vm.cc.html#L19'>recipe</a> '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L60" class="LineNr"> 60 </span>      <span class="Delimiter">}</span>
-<span id="L61" class="LineNr"> 61 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should have a single value in /names, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!s<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 should have a single value in /names, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L62" class="LineNr"> 62 </span>      <span class="Normal">const</span> string&amp; surrounding_recipe_name = s<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
 <span id="L63" class="LineNr"> 63 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>surrounding_recipe_name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L64" class="LineNr"> 64 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 doesn't initialize its /names property in recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;slot 0 doesn't initialize its /names property in recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L65" class="LineNr"> 65 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L66" class="LineNr"> 66 </span>      <span class="Delimiter">}</span>
 <span id="L67" class="LineNr"> 67 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)</span>
 <span id="L68" class="LineNr"> 68 </span>          &amp;&amp; get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)</span> != get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' can have only one 'surrounding' <a href='010vm.cc.html#L19'>recipe</a> but has '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)).</span>name &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' can have only one 'surrounding' <a href='010vm.cc.html#L19'>recipe</a> but has '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">)).</span>name &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L70" class="LineNr"> 70 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span>      <span class="Delimiter">}</span>
-<span id="L72" class="LineNr"> 72 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lexically surrounding space for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; comes from &quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;name&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lexically surrounding space for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; comes from &quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L73" class="LineNr"> 73 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't find recipe providing surrounding space for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'; looking for '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't find recipe providing surrounding space for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'; looking for '&quot;</span> &lt;&lt; surrounding_recipe_name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>      <span class="Delimiter">}</span>
 <span id="L77" class="LineNr"> 77 </span>      <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> surrounding_recipe_name<span class="Delimiter">));</span>
@@ -147,11 +147,11 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(replace{} &quot;int lookup_name(const reagent&amp; r, const <a href='010vm.cc.html#L14'>recipe_ordinal</a> default_recipe)&quot;)</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Normal">int</span> lookup_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> default_recipe<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Name[default_recipe]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;name not found: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Name[default_recipe]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;name not found: &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Identifier">return</span> Name[default_recipe][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>  string_tree* p = property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">);</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">int</span> n = to_integer<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  assert<span class="Delimiter">(</span>n &gt;= <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> surrounding_recipe = <a href='045closure_name.cc.html#L121'>lookup_surrounding_recipe</a><span class="Delimiter">(</span>default_recipe<span class="Delimiter">,</span> n<span class="Delimiter">);</span>
@@ -166,11 +166,11 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span><span class="Normal">int</span> lookup_name<span class="Delimiter">(</span><span class="Normal">const</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> set&lt;recipe_ordinal&gt;&amp; done<span class="Delimiter">,</span> vector&lt;recipe_ordinal&gt;&amp; path<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Name[r]<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> Name[r][x<span class="Delimiter">.</span>name]<span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>done<span class="Delimiter">,</span> r<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't compute address of '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't compute address of '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L109" class="LineNr">109 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L110" class="LineNr">110 </span>    <span class="Delimiter">}</span>
-<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; r &lt;&lt; <span class="Constant">&quot;..ad infinitum</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; path<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>path<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; requires computing names of &quot;</span> &lt;&lt; r &lt;&lt; <span class="Constant">&quot;..ad infinitum</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L112" class="LineNr">112 </span>    <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Delimiter">}</span>
 <span id="L114" class="LineNr">114 </span>  done<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
@@ -183,7 +183,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span><a href='010vm.cc.html#L14'>recipe_ordinal</a> <a href='045closure_name.cc.html#L121'>lookup_surrounding_recipe</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> <span class="Normal">int</span> n<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>n == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> r<span class="Delimiter">;</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;don't know surrounding recipe of '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;don't know surrounding recipe of '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L125" class="LineNr">125 </span>    <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Surrounding_space<span class="Delimiter">,</span> r<span class="Delimiter">));</span>
@@ -196,7 +196,7 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L135" class="LineNr">135 </span>    string_tree* p = property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;space&quot;</span><span class="Delimiter">);</span>
 <span id="L136" class="LineNr">136 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!p || !p<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L137" class="LineNr">137 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value in '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;/space property should have exactly one (non-negative integer) value in '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L138" class="LineNr">138 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span>    <span class="Delimiter">}</span>
 <span id="L140" class="LineNr">140 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>value != <span class="Constant">&quot;0&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index 725c14ef..9c357115 100644
--- a/html/046check_type_by_name.cc.html
+++ b/html/046check_type_by_name.cc.html
@@ -97,7 +97,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(code)</span>
 <span id="L35" class="LineNr"> 35 </span><span class="Normal">void</span> <a href='046check_type_by_name.cc.html#L35'>check_or_set_types_by_name</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L36" class="LineNr"> 36 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- deduce types for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- deduce types for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L39" class="LineNr"> 39 </span>    instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> in = <span class="Constant">0</span><span class="Delimiter">;</span>  in &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++in<span class="Delimiter">)</span>
@@ -122,14 +122,14 @@ if ('onhashchange' in window) {
 <span id="L59" class="LineNr"> 59 </span>    x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;label&quot;</span><span class="Delimiter">);</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known_types<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known_types<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Normal">const</span> reagent&amp; exemplar = *known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L64" class="LineNr"> 64 </span>  x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*exemplar<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L65" class="LineNr"> 65 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &lt;= &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; &lt;= &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L66" class="LineNr"> 66 </span>  <span class="Comment">// spaces are special; their type includes their /names property</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='043space.cc.html#L127'>is_mu_space</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &amp;&amp; !has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_property<span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing /names property for space variable '&quot;</span> &lt;&lt; exemplar<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing /names property for space variable '&quot;</span> &lt;&lt; exemplar<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L70" class="LineNr"> 70 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="Delimiter">}</span>
 <span id="L72" class="LineNr"> 72 </span>    x<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;names&quot;</span><span class="Delimiter">,</span> <span class="Normal">new</span> string_tree<span class="Delimiter">(</span>*property<span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> <span class="Constant">&quot;names&quot;</span><span class="Delimiter">))));</span>
@@ -141,25 +141,25 @@ if ('onhashchange' in window) {
 <span id="L78" class="LineNr"> 78 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// might get filled in by other logic later</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='041jump_target.cc.html#L11'>is_jump_target</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name != <span class="Constant">&quot;label&quot;</span><span class="Delimiter">)</span>
-<span id="L81" class="LineNr"> 81 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;non-label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' must begin with a letter</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;non-label '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' must begin with a letter</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">}</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known_types<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)</span> == known_types<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>    known_types<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Delimiter">}</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)-&gt;</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L89" class="LineNr"> 89 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' used with multiple types</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)-&gt;</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L89" class="LineNr"> 89 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' used with multiple types</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L90" class="LineNr"> 90 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>known_types<span class="Delimiter">.</span>find<span class="Delimiter">(</span>x<span class="Delimiter">)-&gt;</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_array<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: can't be just an array. What is it an array of?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: can't be just an array. What is it an array of?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L96" class="LineNr"> 96 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Delimiter">}</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't determine the size of array variable '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'. Either allocate it separately and make the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' an address, or specify the length of the array in the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't determine the size of array variable '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'. Either allocate it separately and make the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' an address, or specify the length of the array in the type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>    <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Delimiter">}</span>
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index f95c5644..be2ab48c 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -103,7 +103,7 @@ if ('onhashchange' in window) {
 <span id="L37" class="LineNr"> 37 </span><span class="muScenario"><a href='050scenario.cc.html#L57'>scenario</a></span> foo [
 <span id="L38" class="LineNr"> 38 </span>  run [
 <span id="L39" class="LineNr"> 39 </span>    <span class="Constant">1</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">13</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [a b c]
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [a b c]
 <span id="L41" class="LineNr"> 41 </span>  ]
 <span id="L42" class="LineNr"> 42 </span>  memory-should-contain [
 <span id="L43" class="LineNr"> 43 </span>    <span class="Constant">1</span><span class="Special"> &lt;- </span><span class="Constant">13</span>
@@ -158,16 +158,16 @@ if ('onhashchange' in window) {
 <span id="L92" class="LineNr"> 92 </span>  <a href='050scenario.cc.html#L57'>scenario</a> result<span class="Delimiter">;</span>
 <span id="L93" class="LineNr"> 93 </span>  result<span class="Delimiter">.</span>name = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Scenario_names<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
-<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate <a href='050scenario.cc.html#L57'>scenario</a> name: '&quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate <a href='050scenario.cc.html#L57'>scenario</a> name: '&quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L96" class="LineNr"> 96 </span>  Scenario_names<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
 <span id="L97" class="LineNr"> 97 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L98" class="LineNr"> 98 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L99" class="LineNr"> 99 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='050scenario.cc.html#L57'>scenario</a> at <a href='003trace.cc.html#L226'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='050scenario.cc.html#L57'>scenario</a> at <a href='003trace.cc.html#L225'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>  <a href='011load.cc.html#L211'>skip_whitespace_and_comments</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Expected '[' after <a href='050scenario.cc.html#L57'>scenario</a> '&quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Expected '[' after <a href='050scenario.cc.html#L57'>scenario</a> '&quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L105" class="LineNr">105 </span>    exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Comment">// scenarios are take special 'code' strings so we need to ignore brackets</span>
@@ -175,13 +175,13 @@ if ('onhashchange' in window) {
 <span id="L109" class="LineNr">109 </span>  result<span class="Delimiter">.</span>to_run = <a href='014literal_string.cc.html#L33'>slurp_quoted</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Comment">// delete [] delimiters</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>result<span class="Delimiter">.</span>to_run<span class="Delimiter">,</span> <span class="Constant">&quot;[&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;scenario &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; should start with '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;scenario &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; should start with '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L113" class="LineNr">113 </span>    result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L114" class="LineNr">114 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Delimiter">}</span>
 <span id="L116" class="LineNr">116 </span>  result<span class="Delimiter">.</span>to_run<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>to_run<span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>to_run<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">']'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;scenario &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has an unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L118" class="LineNr">118 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;scenario &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has an unbalanced '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L119" class="LineNr">119 </span>    result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L120" class="LineNr">120 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Delimiter">}</span>
@@ -288,7 +288,7 @@ if ('onhashchange' in window) {
 <span id="L222" class="LineNr">222 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!trace_contains_errors<span class="Delimiter">())</span>
 <span id="L223" class="LineNr">223 </span>    run<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>front<span class="Delimiter">());</span>
 <span id="L224" class="LineNr">224 </span>  <span class="Comment">// End Mu Test Teardown</span>
-<span id="L225" class="LineNr">225 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L221'>trace_contains_errors</a><span class="Delimiter">()</span> &amp;&amp; !Scenario_testing_scenario<span class="Delimiter">)</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L220'>trace_contains_errors</a><span class="Delimiter">()</span> &amp;&amp; !Scenario_testing_scenario<span class="Delimiter">)</span>
 <span id="L226" class="LineNr">226 </span>    Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L227" class="LineNr">227 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>not_already_inside_test &amp;&amp; Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L228" class="LineNr">228 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
@@ -346,7 +346,7 @@ if ('onhashchange' in window) {
 <span id="L280" class="LineNr">280 </span>  bind_special_scenario_names<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L281" class="LineNr">281 </span>  <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
 <span id="L282" class="LineNr">282 </span>  run<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L283" class="LineNr">283 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
+<span id="L283" class="LineNr">283 </span>  <a href='003trace.cc.html#L256'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
 <span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
 <span id="L285" class="LineNr">285 </span>
 <span id="L286" class="LineNr">286 </span><span class="Comment">//: Watch out for redefinitions of scenario routines. We should never ever be</span>
@@ -463,7 +463,7 @@ if ('onhashchange' in window) {
 <span id="L397" class="LineNr">397 </span>    string lhs = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L398" class="LineNr">398 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>lhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L399" class="LineNr">399 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L400" class="LineNr">400 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L400" class="LineNr">400 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L401" class="LineNr">401 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L402" class="LineNr">402 </span>    <span class="Delimiter">}</span>
 <span id="L403" class="LineNr">403 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span>lhs<span class="Delimiter">))</span> <span class="Delimiter">{</span>
@@ -477,22 +477,22 @@ if ('onhashchange' in window) {
 <span id="L411" class="LineNr">411 </span>    string rhs = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L412" class="LineNr">412 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>rhs<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L413" class="LineNr">413 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L414" class="LineNr">414 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L414" class="LineNr">414 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L415" class="LineNr">415 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L416" class="LineNr">416 </span>    <span class="Delimiter">}</span>
 <span id="L417" class="LineNr">417 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span>rhs<span class="Delimiter">)</span> &amp;&amp; !is_noninteger<span class="Delimiter">(</span>rhs<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L418" class="LineNr">418 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L419" class="LineNr">419 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' can't contain non-number &quot;</span> &lt;&lt; rhs &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L419" class="LineNr">419 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' can't contain non-number &quot;</span> &lt;&lt; rhs &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L420" class="LineNr">420 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L421" class="LineNr">421 </span>      <span class="Identifier">return</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="Normal">double</span> value = <a href='015literal_noninteger.cc.html#L26'>to_double</a><span class="Delimiter">(</span>rhs<span class="Delimiter">);</span>
 <span id="L424" class="LineNr">424 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>locations_checked<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">))</span>
-<span id="L425" class="LineNr">425 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;duplicate expectation for location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L426" class="LineNr">426 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L425" class="LineNr">425 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;duplicate expectation for location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L426" class="LineNr">426 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L427" class="LineNr">427 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">)</span> != value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L428" class="LineNr">428 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L429" class="LineNr">429 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' to contain &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L429" class="LineNr">429 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot;' to contain &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L430" class="LineNr">430 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L431" class="LineNr">431 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L432" class="LineNr">432 </span>    <span class="Delimiter">}</span>
@@ -508,7 +508,7 @@ if ('onhashchange' in window) {
 <span id="L442" class="LineNr">442 </span>    string _assign = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L443" class="LineNr">443 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>_assign<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L444" class="LineNr">444 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L445" class="LineNr">445 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L226'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L445" class="LineNr">445 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L225'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L446" class="LineNr">446 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L447" class="LineNr">447 </span>    <span class="Delimiter">}</span>
 <span id="L448" class="LineNr">448 </span>    assert<span class="Delimiter">(</span>_assign == <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">);</span>
@@ -516,39 +516,39 @@ if ('onhashchange' in window) {
 <span id="L450" class="LineNr">450 </span>    string literal = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L451" class="LineNr">451 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>literal<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L452" class="LineNr">452 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L453" class="LineNr">453 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L226'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L453" class="LineNr">453 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;incomplete 'memory-should-contain' block at <a href='003trace.cc.html#L225'>end</a> of file (3)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L454" class="LineNr">454 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L455" class="LineNr">455 </span>    <span class="Delimiter">}</span>
 <span id="L456" class="LineNr">456 </span>    <span class="Normal">int</span> <a href='043space.cc.html#L101'>address</a> = x<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L457" class="LineNr">457 </span>    <span class="Comment">// exclude quoting brackets</span>
 <span id="L458" class="LineNr">458 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*literal<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L459" class="LineNr">459 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;array:character types inside 'memory-should-contain' can only be compared with text literals surrounded by [], not '&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L459" class="LineNr">459 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;array:character types inside 'memory-should-contain' can only be compared with text literals surrounded by [], not '&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L460" class="LineNr">460 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L461" class="LineNr">461 </span>    <span class="Delimiter">}</span>
 <span id="L462" class="LineNr">462 </span>    literal<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>literal<span class="Delimiter">.</span>begin<span class="Delimiter">());</span>
-<span id="L463" class="LineNr">463 </span>    assert<span class="Delimiter">(</span>*--literal<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()</span> == <span class="Constant">']'</span><span class="Delimiter">);</span>  literal<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>--literal<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">());</span>
+<span id="L463" class="LineNr">463 </span>    assert<span class="Delimiter">(</span>*--literal<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()</span> == <span class="Constant">']'</span><span class="Delimiter">);</span>  literal<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>--literal<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span>
 <span id="L464" class="LineNr">464 </span>    check_mu_text<span class="Delimiter">(</span><a href='043space.cc.html#L101'>address</a><span class="Delimiter">,</span> literal<span class="Delimiter">);</span>
 <span id="L465" class="LineNr">465 </span>    <span class="Identifier">return</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="Comment">// End Scenario Type Special-cases</span>
-<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;don't know how to check memory for '&quot;</span> &lt;&lt; lhs &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;don't know how to check memory for '&quot;</span> &lt;&lt; lhs &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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="Normal">void</span> check_mu_text<span class="Delimiter">(</span><span class="Normal">int</span> start<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; literal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L472" class="LineNr">472 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking text length at &quot;</span> &lt;&lt; start &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L472" class="LineNr">472 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking text length at &quot;</span> &lt;&lt; start &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L473" class="LineNr">473 </span>  <span class="Normal">int</span> <a href='032array.cc.html#L319'>array_length</a> = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> start<span class="Delimiter">));</span>
 <span id="L474" class="LineNr">474 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='032array.cc.html#L319'>array_length</a> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L475" class="LineNr">475 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L476" class="LineNr">476 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; start &lt;&lt; <span class="Constant">&quot;' to contain length &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; of text [&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;] but saw &quot;</span> &lt;&lt; <a href='032array.cc.html#L319'>array_length</a> &lt;&lt; <span class="Constant">&quot; (for text [&quot;</span> &lt;&lt; <a href='038new_text.cc.html#L149'>read_mu_characters</a><span class="Delimiter">(</span>start+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <a href='032array.cc.html#L319'>array_length</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;])</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L476" class="LineNr">476 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location '&quot;</span> &lt;&lt; start &lt;&lt; <span class="Constant">&quot;' to contain length &quot;</span> &lt;&lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; of text [&quot;</span> &lt;&lt; literal &lt;&lt; <span class="Constant">&quot;] but saw &quot;</span> &lt;&lt; <a href='032array.cc.html#L319'>array_length</a> &lt;&lt; <span class="Constant">&quot; (for text [&quot;</span> &lt;&lt; <a href='038new_text.cc.html#L149'>read_mu_characters</a><span class="Delimiter">(</span>start+<span class="Comment">/*</span><span class="Comment">skip length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> <a href='032array.cc.html#L319'>array_length</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;])</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L477" class="LineNr">477 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L478" class="LineNr">478 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L479" class="LineNr">479 </span>  <span class="Delimiter">}</span>
 <span id="L480" class="LineNr">480 </span>  <span class="Normal">int</span> curr = start+<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// now skip length</span>
 <span id="L481" class="LineNr">481 </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#L141'>SIZE</a><span class="Delimiter">(</span>literal<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L482" class="LineNr">482 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; curr+i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L482" class="LineNr">482 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking location &quot;</span> &lt;&lt; curr+i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L483" class="LineNr">483 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr+i<span class="Delimiter">)</span> != literal<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L484" class="LineNr">484 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L485" class="LineNr">485 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location &quot;</span> &lt;&lt; <span class="Delimiter">(</span>curr+i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to contain &quot;</span> &lt;&lt; literal<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr+i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L485" class="LineNr">485 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected location &quot;</span> &lt;&lt; <span class="Delimiter">(</span>curr+i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to contain &quot;</span> &lt;&lt; literal<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but saw &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr+i<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L486" class="LineNr">486 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L487" class="LineNr">487 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L488" class="LineNr">488 </span>    <span class="Delimiter">}</span>
@@ -643,7 +643,7 @@ if ('onhashchange' in window) {
 <span id="L577" class="LineNr">577 </span>    <span class="Normal">a</span>: d
 <span id="L578" class="LineNr">578 </span>  ]
 <span id="L579" class="LineNr">579 </span>]
-<span id="L580" class="LineNr">580 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: missing [b] in <a href='003trace.cc.html#L190'>trace</a> with label 'a'</span>
+<span id="L580" class="LineNr">580 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: missing [b] in <a href='003trace.cc.html#L189'>trace</a> with label 'a'</span>
 <span id="L581" class="LineNr">581 </span>
 <span id="L582" class="LineNr">582 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L583" class="LineNr">583 </span>TRACE_SHOULD_CONTAIN<span class="Delimiter">,</span>
@@ -668,34 +668,34 @@ if ('onhashchange' in window) {
 <span id="L602" class="LineNr">602 </span>  vector&lt;trace_line&gt; expected_lines = parse_trace<span class="Delimiter">(</span>expected<span class="Delimiter">);</span>
 <span id="L603" class="LineNr">603 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L604" class="LineNr">604 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L605" class="LineNr">605 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L605" class="LineNr">605 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L606" class="LineNr">606 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<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="L607" class="LineNr">607 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents != <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L607" class="LineNr">607 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents != <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L608" class="LineNr">608 </span>    <span class="Comment">// match</span>
 <span id="L609" class="LineNr">609 </span>    ++curr_expected_line<span class="Delimiter">;</span>
 <span id="L610" class="LineNr">610 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L611" class="LineNr">611 </span>  <span class="Delimiter">}</span>
 <span id="L612" class="LineNr">612 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;missing [&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] &quot;</span>
-<span id="L614" class="LineNr">614 </span>        &lt;&lt; <span class="Constant">&quot;in <a href='003trace.cc.html#L190'>trace</a> with label '&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L613" class="LineNr">613 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;missing [&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] &quot;</span>
+<span id="L614" class="LineNr">614 </span>        &lt;&lt; <span class="Constant">&quot;in <a href='003trace.cc.html#L189'>trace</a> with label '&quot;</span> &lt;&lt; expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L615" class="LineNr">615 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span>
-<span id="L616" class="LineNr">616 </span>    <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label<span class="Delimiter">);</span>
+<span id="L616" class="LineNr">616 </span>    <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>label<span class="Delimiter">);</span>
 <span id="L617" class="LineNr">617 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</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>vector&lt;trace_line&gt; parse_trace<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L621" class="LineNr">621 </span>  vector&lt;string&gt; buf = <a href='003trace.cc.html#L371'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
+<span id="L621" class="LineNr">621 </span>  vector&lt;string&gt; buf = <a href='003trace.cc.html#L370'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L622" class="LineNr">622 </span>  vector&lt;trace_line&gt; result<span class="Delimiter">;</span>
 <span id="L623" class="LineNr">623 </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#L141'>SIZE</a><span class="Delimiter">(</span>buf<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L624" class="LineNr">624 </span>    buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> = <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L624" class="LineNr">624 </span>    buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> = <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L625" class="LineNr">625 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L626" class="LineNr">626 </span>    <span class="Normal">int</span> delim = buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>find<span class="Delimiter">(</span><span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
 <span id="L627" class="LineNr">627 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>delim == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L628" class="LineNr">628 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;lines in 'trace-should-contain' should be of the form &lt;label&gt;: &lt;contents&gt;. Both parts are required.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L628" class="LineNr">628 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;lines in 'trace-should-contain' should be of the form &lt;label&gt;: &lt;contents&gt;. Both parts are required.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L629" class="LineNr">629 </span>      result<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L630" class="LineNr">630 </span>      <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L631" class="LineNr">631 </span>    <span class="Delimiter">}</span>
-<span id="L632" class="LineNr">632 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> delim<span class="Delimiter">)),</span>  <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span>delim+<span class="Constant">2</span><span class="Delimiter">))));</span>
+<span id="L632" class="LineNr">632 </span>    result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> delim<span class="Delimiter">)),</span>  <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span>buf<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>substr<span class="Delimiter">(</span>delim+<span class="Constant">2</span><span class="Delimiter">))));</span>
 <span id="L633" class="LineNr">633 </span>  <span class="Delimiter">}</span>
 <span id="L634" class="LineNr">634 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L635" class="LineNr">635 </span><span class="Delimiter">}</span>
@@ -705,26 +705,26 @@ if ('onhashchange' in window) {
 <span id="L639" class="LineNr">639 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L640" class="LineNr">640 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L641" class="LineNr">641 </span>  run [
-<span id="L642" class="LineNr">642 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
+<span id="L642" class="LineNr">642 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
 <span id="L643" class="LineNr">643 </span>  ]
 <span id="L644" class="LineNr">644 </span>  trace-should-contain [
 <span id="L645" class="LineNr">645 </span>    <span class="Normal">a</span>: b
 <span id="L646" class="LineNr">646 </span>    <span class="Normal">a</span>: d
 <span id="L647" class="LineNr">647 </span>  ]
 <span id="L648" class="LineNr">648 </span>]
-<span id="L649" class="LineNr">649 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: missing [d] in <a href='003trace.cc.html#L190'>trace</a> with label 'a'</span>
+<span id="L649" class="LineNr">649 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: missing [d] in <a href='003trace.cc.html#L189'>trace</a> with label 'a'</span>
 <span id="L650" class="LineNr">650 </span>
 <span id="L651" class="LineNr">651 </span><span class="Delimiter">:(scenario trace_check_passes_silently)</span>
 <span id="L652" class="LineNr">652 </span><span class="Special">% Scenario_testing_scenario = true;</span>
 <span id="L653" class="LineNr">653 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L654" class="LineNr">654 </span>  run [
-<span id="L655" class="LineNr">655 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
+<span id="L655" class="LineNr">655 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
 <span id="L656" class="LineNr">656 </span>  ]
 <span id="L657" class="LineNr">657 </span>  trace-should-contain [
 <span id="L658" class="LineNr">658 </span>    <span class="Normal">a</span>: b
 <span id="L659" class="LineNr">659 </span>  ]
 <span id="L660" class="LineNr">660 </span>]
-<span id="L661" class="LineNr">661 </span><span class="traceAbsent">-error: missing [b] in <a href='003trace.cc.html#L190'>trace</a> with label 'a'</span>
+<span id="L661" class="LineNr">661 </span><span class="traceAbsent">-error: missing [b] in <a href='003trace.cc.html#L189'>trace</a> with label 'a'</span>
 <span id="L662" class="LineNr">662 </span>$error: <span class="Constant">0</span>
 <span id="L663" class="LineNr">663 </span>
 <span id="L664" class="LineNr">664 </span><span class="Comment">//: 'trace-should-not-contain' is like the '-' lines in our scenarios so far</span>
@@ -736,13 +736,13 @@ if ('onhashchange' in window) {
 <span id="L670" class="LineNr">670 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L671" class="LineNr">671 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L672" class="LineNr">672 </span>  run [
-<span id="L673" class="LineNr">673 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
+<span id="L673" class="LineNr">673 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [b]
 <span id="L674" class="LineNr">674 </span>  ]
 <span id="L675" class="LineNr">675 </span>  trace-should-<span class="Normal">not</span>-contain [
 <span id="L676" class="LineNr">676 </span>    <span class="Normal">a</span>: b
 <span id="L677" class="LineNr">677 </span>  ]
 <span id="L678" class="LineNr">678 </span>]
-<span id="L679" class="LineNr">679 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: unexpected [b] in <a href='003trace.cc.html#L190'>trace</a> with label 'a'</span>
+<span id="L679" class="LineNr">679 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: unexpected [b] in <a href='003trace.cc.html#L189'>trace</a> with label 'a'</span>
 <span id="L680" class="LineNr">680 </span>
 <span id="L681" class="LineNr">681 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L682" class="LineNr">682 </span>TRACE_SHOULD_NOT_CONTAIN<span class="Delimiter">,</span>
@@ -767,7 +767,7 @@ if ('onhashchange' in window) {
 <span id="L701" class="LineNr">701 </span>  vector&lt;trace_line&gt; lines = parse_trace<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L702" class="LineNr">702 </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#L141'>SIZE</a><span class="Delimiter">(</span>lines<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L703" class="LineNr">703 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label<span class="Delimiter">,</span> lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents<span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L704" class="LineNr">704 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;unexpected [&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L190'>trace</a> with label '&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L704" class="LineNr">704 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;unexpected [&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>contents &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L189'>trace</a> with label '&quot;</span> &lt;&lt; lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>label &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L705" class="LineNr">705 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L706" class="LineNr">706 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L707" class="LineNr">707 </span>    <span class="Delimiter">}</span>
@@ -782,7 +782,7 @@ if ('onhashchange' in window) {
 <span id="L716" class="LineNr">716 </span>    <span class="Normal">a</span>: b
 <span id="L717" class="LineNr">717 </span>  ]
 <span id="L718" class="LineNr">718 </span>]
-<span id="L719" class="LineNr">719 </span><span class="traceAbsent">-error: unexpected [b] in <a href='003trace.cc.html#L190'>trace</a> with label 'a'</span>
+<span id="L719" class="LineNr">719 </span><span class="traceAbsent">-error: unexpected [b] in <a href='003trace.cc.html#L189'>trace</a> with label 'a'</span>
 <span id="L720" class="LineNr">720 </span>$error: <span class="Constant">0</span>
 <span id="L721" class="LineNr">721 </span>
 <span id="L722" class="LineNr">722 </span><span class="Delimiter">:(scenario trace_negative_check_fails_on_any_unexpected_line)</span>
@@ -790,19 +790,19 @@ if ('onhashchange' in window) {
 <span id="L724" class="LineNr">724 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L725" class="LineNr">725 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L726" class="LineNr">726 </span>  run [
-<span id="L727" class="LineNr">727 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [d]
+<span id="L727" class="LineNr">727 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [d]
 <span id="L728" class="LineNr">728 </span>  ]
 <span id="L729" class="LineNr">729 </span>  trace-should-<span class="Normal">not</span>-contain [
 <span id="L730" class="LineNr">730 </span>    <span class="Normal">a</span>: b
 <span id="L731" class="LineNr">731 </span>    <span class="Normal">a</span>: d
 <span id="L732" class="LineNr">732 </span>  ]
 <span id="L733" class="LineNr">733 </span>]
-<span id="L734" class="LineNr">734 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: unexpected [d] in <a href='003trace.cc.html#L190'>trace</a> with label 'a'</span>
+<span id="L734" class="LineNr">734 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: unexpected [d] in <a href='003trace.cc.html#L189'>trace</a> with label 'a'</span>
 <span id="L735" class="LineNr">735 </span>
 <span id="L736" class="LineNr">736 </span><span class="Delimiter">:(scenario trace_count_check)</span>
 <span id="L737" class="LineNr">737 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L738" class="LineNr">738 </span>  run [
-<span id="L739" class="LineNr">739 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [foo]
+<span id="L739" class="LineNr">739 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [foo]
 <span id="L740" class="LineNr">740 </span>  ]
 <span id="L741" class="LineNr">741 </span>  check-trace-count-<span class="Normal">for</span>-label <span class="Constant">1</span><span class="Delimiter">,</span> [a]
 <span id="L742" class="LineNr">742 </span>]
@@ -815,15 +815,15 @@ if ('onhashchange' in window) {
 <span id="L749" class="LineNr">749 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L750" class="LineNr">750 </span><span class="Normal">case</span> CHECK_TRACE_COUNT_FOR_LABEL: <span class="Delimiter">{</span>
 <span id="L751" class="LineNr">751 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L752" class="LineNr">752 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'check-trace-count-for-label' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L752" class="LineNr">752 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'check-trace-count-for-label' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L753" class="LineNr">753 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L754" class="LineNr">754 </span>  <span class="Delimiter">}</span>
 <span id="L755" class="LineNr">755 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L756" class="LineNr">756 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'check-trace-count-for-label' should be a number (count), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L756" class="LineNr">756 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'check-trace-count-for-label' should be a number (count), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L757" class="LineNr">757 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L758" class="LineNr">758 </span>  <span class="Delimiter">}</span>
 <span id="L759" class="LineNr">759 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L760" class="LineNr">760 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L760" class="LineNr">760 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L761" class="LineNr">761 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L762" class="LineNr">762 </span>  <span class="Delimiter">}</span>
 <span id="L763" class="LineNr">763 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -836,8 +836,8 @@ if ('onhashchange' in window) {
 <span id="L770" class="LineNr">770 </span>  <span class="Normal">int</span> count = trace_count<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L771" class="LineNr">771 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count != expected_count<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L772" class="LineNr">772 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L773" class="LineNr">773 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L190'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L190'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L774" class="LineNr">774 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L773" class="LineNr">773 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L189'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L189'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L774" class="LineNr">774 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L775" class="LineNr">775 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L776" class="LineNr">776 </span>  <span class="Delimiter">}</span>
 <span id="L777" class="LineNr">777 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -850,15 +850,15 @@ if ('onhashchange' in window) {
 <span id="L784" class="LineNr">784 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L785" class="LineNr">785 </span><span class="Normal">case</span> CHECK_TRACE_COUNT_FOR_LABEL_GREATER_THAN: <span class="Delimiter">{</span>
 <span id="L786" class="LineNr">786 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L787" class="LineNr">787 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'check-trace-count-for-label' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L787" class="LineNr">787 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'check-trace-count-for-label' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L788" class="LineNr">788 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L789" class="LineNr">789 </span>  <span class="Delimiter">}</span>
 <span id="L790" class="LineNr">790 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L791" class="LineNr">791 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'check-trace-count-for-label' should be a number (count), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L791" class="LineNr">791 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'check-trace-count-for-label' should be a number (count), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L792" class="LineNr">792 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L793" class="LineNr">793 </span>  <span class="Delimiter">}</span>
 <span id="L794" class="LineNr">794 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L795" class="LineNr">795 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L795" class="LineNr">795 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L796" class="LineNr">796 </span>    <span class="Identifier">break</span><span class="Delimiter">;</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>
@@ -871,10 +871,10 @@ if ('onhashchange' in window) {
 <span id="L805" class="LineNr">805 </span>  <span class="Normal">int</span> count = trace_count<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L806" class="LineNr">806 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count &lt;= expected_count<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L807" class="LineNr">807 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L808" class="LineNr">808 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected more than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L190'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L190'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L808" class="LineNr">808 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected more than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L189'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L189'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L809" class="LineNr">809 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L810" class="LineNr">810 </span>      cerr &lt;&lt; <span class="Constant">&quot;trace contents:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L811" class="LineNr">811 </span>      <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L811" class="LineNr">811 </span>      <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span>label<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">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L814" class="LineNr">814 </span>  <span class="Delimiter">}</span>
@@ -888,15 +888,15 @@ if ('onhashchange' in window) {
 <span id="L822" class="LineNr">822 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L823" class="LineNr">823 </span><span class="Normal">case</span> CHECK_TRACE_COUNT_FOR_LABEL_LESSER_THAN: <span class="Delimiter">{</span>
 <span id="L824" class="LineNr">824 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L825" class="LineNr">825 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'check-trace-count-for-label' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L825" class="LineNr">825 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'check-trace-count-for-label' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L826" class="LineNr">826 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L827" class="LineNr">827 </span>  <span class="Delimiter">}</span>
 <span id="L828" class="LineNr">828 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L829" class="LineNr">829 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'check-trace-count-for-label' should be a number (count), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L829" class="LineNr">829 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'check-trace-count-for-label' should be a number (count), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L830" class="LineNr">830 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L831" class="LineNr">831 </span>  <span class="Delimiter">}</span>
 <span id="L832" class="LineNr">832 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L833" class="LineNr">833 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L833" class="LineNr">833 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'check-trace-count-for-label' should be a literal string (label), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L834" class="LineNr">834 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L835" class="LineNr">835 </span>  <span class="Delimiter">}</span>
 <span id="L836" class="LineNr">836 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -909,10 +909,10 @@ if ('onhashchange' in window) {
 <span id="L843" class="LineNr">843 </span>  <span class="Normal">int</span> count = trace_count<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L844" class="LineNr">844 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>count &gt;= expected_count<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L845" class="LineNr">845 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L846" class="LineNr">846 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected less than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L190'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L190'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L846" class="LineNr">846 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected less than &quot;</span> &lt;&lt; expected_count &lt;&lt; <span class="Constant">&quot; lines in <a href='003trace.cc.html#L189'>trace</a> with label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' in <a href='003trace.cc.html#L189'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L847" class="LineNr">847 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L848" class="LineNr">848 </span>      cerr &lt;&lt; <span class="Constant">&quot;trace contents:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L849" class="LineNr">849 </span>      <a href='003trace.cc.html#L194'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L849" class="LineNr">849 </span>      <a href='003trace.cc.html#L193'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L850" class="LineNr">850 </span>    <span class="Delimiter">}</span>
 <span id="L851" class="LineNr">851 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L852" class="LineNr">852 </span>  <span class="Delimiter">}</span>
@@ -924,11 +924,11 @@ if ('onhashchange' in window) {
 <span id="L858" class="LineNr">858 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L859" class="LineNr">859 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L860" class="LineNr">860 </span>  run [
-<span id="L861" class="LineNr">861 </span>    <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [foo]
+<span id="L861" class="LineNr">861 </span>    <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">1</span><span class="Delimiter">,</span> [a]<span class="Delimiter">,</span> [foo]
 <span id="L862" class="LineNr">862 </span>  ]
 <span id="L863" class="LineNr">863 </span>  check-trace-count-<span class="Normal">for</span>-label <span class="Constant">2</span><span class="Delimiter">,</span> [a]
 <span id="L864" class="LineNr">864 </span>]
-<span id="L865" class="LineNr">865 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: expected 2 lines in <a href='003trace.cc.html#L190'>trace</a> with label 'a' in <a href='003trace.cc.html#L190'>trace</a></span>
+<span id="L865" class="LineNr">865 </span><span class="traceContains">+error: F - <a href='000organization.cc.html#L113'>main</a>: expected 2 lines in <a href='003trace.cc.html#L189'>trace</a> with label 'a' in <a href='003trace.cc.html#L189'>trace</a></span>
 <span id="L866" class="LineNr">866 </span>
 <span id="L867" class="LineNr">867 </span><span class="Comment">//: Minor detail: ignore 'system' calls in scenarios, since anything we do</span>
 <span id="L868" class="LineNr">868 </span><span class="Comment">//: with them is by definition impossible to test through Mu.</span>
@@ -953,11 +953,11 @@ if ('onhashchange' in window) {
 <span id="L887" class="LineNr">887 </span><span class="Delimiter">}</span>
 <span id="L888" class="LineNr">888 </span>
 <span id="L889" class="LineNr">889 </span><span class="Delimiter">:(after &quot;void transform_all()&quot;)</span>
-<span id="L890" class="LineNr">890 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L890" class="LineNr">890 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;recipe_ordinal<span class="Delimiter">,</span> recipe&gt;::iterator p = Recipe<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Recipe<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L891" class="LineNr">891 </span>    <span class="Normal">const</span> recipe&amp; r = p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L892" class="LineNr">892 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'_'</span><span class="Delimiter">)</span> == string::npos<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L893" class="LineNr">893 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>is_autogenerated<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// created by previous call to transform_all()</span>
-<span id="L894" class="LineNr">894 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: don't create recipes with '_' in the name</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L894" class="LineNr">894 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: don't create recipes with '_' in the name</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L895" class="LineNr">895 </span>  <span class="Delimiter">}</span>
 <span id="L896" class="LineNr">896 </span>
 <span id="L897" class="LineNr">897 </span><span class="SalientComment">//:: Helpers</span>
@@ -972,7 +972,7 @@ if ('onhashchange' in window) {
 <span id="L906" class="LineNr">906 </span>  string _scenario = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L907" class="LineNr">907 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>_scenario<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L908" class="LineNr">908 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L909" class="LineNr">909 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='050scenario.cc.html#L57'>scenario</a> in string passed into run_mu_scenario()</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L909" class="LineNr">909 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='050scenario.cc.html#L57'>scenario</a> in string passed into run_mu_scenario()</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L910" class="LineNr">910 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L911" class="LineNr">911 </span>  <span class="Delimiter">}</span>
 <span id="L912" class="LineNr">912 </span>  assert<span class="Delimiter">(</span>_scenario == <span class="Constant">&quot;scenario&quot;</span><span class="Delimiter">);</span>
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html
index d32070dd..54968c93 100644
--- a/html/052tangle.cc.html
+++ b/html/052tangle.cc.html
@@ -107,30 +107,30 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr"> 44 </span>  string label = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L46" class="LineNr"> 46 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'before' block at <a href='003trace.cc.html#L226'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L47" class="LineNr"> 47 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'before' block at <a href='003trace.cc.html#L225'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Delimiter">}</span>
 <span id="L50" class="LineNr"> 50 </span>  <a href='010vm.cc.html#L19'>recipe</a> tmp<span class="Delimiter">;</span>
 <span id="L51" class="LineNr"> 51 </span>  <a href='011load.cc.html#L83'>slurp_body</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
 <span id="L52" class="LineNr"> 52 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='052tangle.cc.html#L13'>is_waypoint</a><span class="Delimiter">(</span>label<span class="Delimiter">))</span>
-<span id="L53" class="LineNr"> 53 </span>    Before_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>Before_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">());</span>
+<span id="L53" class="LineNr"> 53 </span>    Before_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>Before_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Normal">else</span>
-<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't tangle before non-waypoint &quot;</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't tangle before non-waypoint &quot;</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Comment">// End before Command Handler</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">}</span>
 <span id="L58" class="LineNr"> 58 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command == <span class="Constant">&quot;after&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L59" class="LineNr"> 59 </span>  string label = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </span>    assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'after' block at <a href='003trace.cc.html#L226'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'after' block at <a href='003trace.cc.html#L225'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Delimiter">}</span>
 <span id="L65" class="LineNr"> 65 </span>  <a href='010vm.cc.html#L19'>recipe</a> tmp<span class="Delimiter">;</span>
 <span id="L66" class="LineNr"> 66 </span>  <a href='011load.cc.html#L83'>slurp_body</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='052tangle.cc.html#L13'>is_waypoint</a><span class="Delimiter">(</span>label<span class="Delimiter">))</span>
-<span id="L68" class="LineNr"> 68 </span>    After_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>After_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">());</span>
+<span id="L68" class="LineNr"> 68 </span>    After_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>After_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Normal">else</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;can't tangle after non-waypoint &quot;</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;can't tangle after non-waypoint &quot;</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Comment">// End after Command Handler</span>
 <span id="L72" class="LineNr"> 72 </span><span class="Delimiter">}</span>
 <span id="L73" class="LineNr"> 73 </span>
@@ -153,7 +153,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> insert_fragments<span class="Delimiter">(</span>recipe&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- insert fragments into <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- insert fragments into <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>  <span class="Normal">bool</span> made_progress =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Normal">int</span> pass = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>made_progress<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -174,12 +174,12 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>      <span class="Comment">// ok to use contains_key even though Before_fragments uses [],</span>
 <span id="L112" class="LineNr">112 </span>      <span class="Comment">// because appending an empty recipe is a noop</span>
 <span id="L113" class="LineNr">113 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Before_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;insert fragments before label &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>label &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;insert fragments before label &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>label &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L115" class="LineNr">115 </span>        <a href='052tangle.cc.html#L128'>append_fragment</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> Before_fragments[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L116" class="LineNr">116 </span>      <span class="Delimiter">}</span>
 <span id="L117" class="LineNr">117 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>After_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;insert fragments after label &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>label &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;insert fragments after label &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>label &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L120" class="LineNr">120 </span>        <a href='052tangle.cc.html#L128'>append_fragment</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> After_fragments[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
 <span id="L121" class="LineNr">121 </span>      <span class="Delimiter">}</span>
 <span id="L122" class="LineNr">122 </span>    <span class="Delimiter">}</span>
@@ -228,13 +228,13 @@ if ('onhashchange' in window) {
 <span id="L165" class="LineNr">165 </span><a href='052tangle.cc.html#L167'>check_insert_fragments</a><span class="Delimiter">();</span>
 <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(code)</span>
 <span id="L167" class="LineNr">167 </span><span class="Normal">void</span> <a href='052tangle.cc.html#L167'>check_insert_fragments</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> recipe&gt;::iterator p = Before_fragments<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Before_fragments<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> recipe&gt;::iterator p = Before_fragments<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Before_fragments<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L169" class="LineNr">169 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
-<span id="L170" class="LineNr">170 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;could not locate insert before label &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;could not locate insert before label &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Delimiter">}</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> recipe&gt;::iterator p = After_fragments<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != After_fragments<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> recipe&gt;::iterator p = After_fragments<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != After_fragments<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L173" class="LineNr">173 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span>
-<span id="L174" class="LineNr">174 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;could not locate insert after label &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;could not locate insert after label &quot;</span> &lt;&lt; p<span class="Delimiter">-&gt;</span>first &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
 <span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
 <span id="L177" class="LineNr">177 </span>
@@ -515,21 +515,21 @@ if ('onhashchange' in window) {
 <span id="L452" class="LineNr">452 </span>       <span class="Constant">&quot;  1:num/raw &lt;- copy 34</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L453" class="LineNr">453 </span>       <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span>
-<span id="L455" class="LineNr">455 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
+<span id="L455" class="LineNr">455 </span>  <a href='003trace.cc.html#L256'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span>
 <span id="L456" class="LineNr">456 </span>  Hide_errors =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L457" class="LineNr">457 </span>  <span class="Comment">// try to tangle into recipe foo after transform</span>
 <span id="L458" class="LineNr">458 </span>  load<span class="Delimiter">(</span><span class="Constant">&quot;before &lt;label&gt; [</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L459" class="LineNr">459 </span>       <span class="Constant">&quot;  2:num/raw &lt;- copy 35</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L460" class="LineNr">460 </span>       <span class="Constant">&quot;]</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">);</span>
-<span id="L461" class="LineNr">461 </span>  <a href='003trace.cc.html#L256'>CHECK_TRACE_CONTAINS_ERRORS</a><span class="Delimiter">();</span>
+<span id="L461" class="LineNr">461 </span>  <a href='003trace.cc.html#L255'>CHECK_TRACE_CONTAINS_ERRORS</a><span class="Delimiter">();</span>
 <span id="L462" class="LineNr">462 </span><span class="Delimiter">}</span>
 <span id="L463" class="LineNr">463 </span>
 <span id="L464" class="LineNr">464 </span><span class="Delimiter">:(before &quot;End before Command Handler&quot;)</span>
 <span id="L465" class="LineNr">465 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> label<span class="Delimiter">))</span>
-<span id="L466" class="LineNr">466 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;we've already tangled some code at label &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; in a previous call to transform_all(). Those locations won't be updated.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L466" class="LineNr">466 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;we've already tangled some code at label &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; in a previous call to transform_all(). Those locations won't be updated.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L467" class="LineNr">467 </span><span class="Delimiter">:(before &quot;End after Command Handler&quot;)</span>
 <span id="L468" class="LineNr">468 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> label<span class="Delimiter">))</span>
-<span id="L469" class="LineNr">469 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;we've already tangled some code at label &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; in a previous call to transform_all(). Those locations won't be updated.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L469" class="LineNr">469 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;we've already tangled some code at label &quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot; in a previous call to transform_all(). Those locations won't be updated.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 </pre>
 </body>
 </html>
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index 36d7b5c6..e7a2cff7 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -89,7 +89,7 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr"> 24 </span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before &quot;End Recipe Refinements&quot;)</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe has a header; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe has a header; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L28" class="LineNr"> 28 </span>  <a href='053recipe_header.cc.html#L32'>load_recipe_header</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> result<span class="Delimiter">);</span>
 <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>
@@ -100,25 +100,25 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>    string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L37" class="LineNr"> 37 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L38" class="LineNr"> 38 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> header at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> header at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr"> 39 </span>      <span class="Identifier">return</span><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">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">)</span>
-<span id="L42" class="LineNr"> 42 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; should say '-&gt;' and not '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; should say '-&gt;' and not '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;-&gt;&quot;</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L44" class="LineNr"> 44 </span>    result<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
-<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header ingredient: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header ingredient: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span>    skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<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">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L239'>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> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L49" class="LineNr"> 49 </span>    string s = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </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="L51" class="LineNr"> 51 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L52" class="LineNr"> 52 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> header at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete <a href='010vm.cc.html#L19'>recipe</a> header at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L54" class="LineNr"> 54 </span>    <span class="Delimiter">}</span>
 <span id="L55" class="LineNr"> 55 </span>    result<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>s<span class="Delimiter">));</span>
-<span id="L56" class="LineNr"> 56 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header product: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>products<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;header product: &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>products<span class="Delimiter">.</span>back<span class="Delimiter">().</span>original_string &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>    skip_whitespace_but_not_newline<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Delimiter">}</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// End Load Recipe Header(result)</span>
@@ -214,7 +214,7 @@ if ('onhashchange' in window) {
 <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 class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has a header&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has a header&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L153" class="LineNr">153 </span><span class="Delimiter">}</span>
 <span id="L154" class="LineNr">154 </span>
 <span id="L155" class="LineNr">155 </span><span class="Comment">//: Support type abbreviations in headers.</span>
@@ -253,7 +253,7 @@ if ('onhashchange' in window) {
 <span id="L188" class="LineNr">188 </span>  <span class="Delimiter">}</span>
 <span id="L189" class="LineNr">189 </span><span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;next-ingredient-without-typechecking&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L191" class="LineNr">191 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;never call 'next-ingredient-without-typechecking' directly</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L191" class="LineNr">191 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;never call 'next-ingredient-without-typechecking' directly</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L192" class="LineNr">192 </span>  curr<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L193" class="LineNr">193 </span><span class="Delimiter">}</span>
 <span id="L194" class="LineNr">194 </span>
@@ -298,7 +298,7 @@ if ('onhashchange' in window) {
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(after &quot;use-before-set Error&quot;)</span>
 <span id="L235" class="LineNr">235 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> ingredient<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
-<span id="L236" class="LineNr">236 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L236" class="LineNr">236 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L237" class="LineNr">237 </span>
 <span id="L238" class="LineNr">238 </span><span class="Delimiter">:(scenario load_ingredients_missing_error_2)</span>
 <span id="L239" class="LineNr">239 </span><span class="Special">% Hide_errors = true;</span>
@@ -311,7 +311,7 @@ if ('onhashchange' in window) {
 <span id="L246" class="LineNr">246 </span>
 <span id="L247" class="LineNr">247 </span><span class="Delimiter">:(after &quot;missing-type Error 1&quot;)</span>
 <span id="L248" class="LineNr">248 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> recipe_name<span class="Delimiter">)),</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span>
-<span id="L249" class="LineNr">249 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L249" class="LineNr">249 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L250" class="LineNr">250 </span>
 <span id="L251" class="LineNr">251 </span><span class="Delimiter">:(code)</span>
 <span id="L252" class="LineNr">252 </span><span class="Normal">bool</span> is_present_in_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; callee<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; ingredient_name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -353,7 +353,7 @@ if ('onhashchange' in window) {
 <span id="L288" class="LineNr">288 </span><span class="Delimiter">:(code)</span>
 <span id="L289" class="LineNr">289 </span><span class="Normal">void</span> check_calls_against_header<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check calls inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check calls inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L292" class="LineNr">292 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L293" class="LineNr">293 </span>    <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L294" class="LineNr">294 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='028call_return.cc.html#L115'>is_primitive</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -362,16 +362,16 @@ if ('onhashchange' in window) {
 <span id="L297" class="LineNr">297 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L298" class="LineNr">298 </span>      <span class="Comment">// ingredients coerced from call to callee</span>
 <span id="L299" class="LineNr">299 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L301" class="LineNr">301 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  ['&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' vs '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;']</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L301" class="LineNr">301 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  ['&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' vs '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;']</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L302" class="LineNr">302 </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="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L305" class="LineNr">305 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L306" class="LineNr">306 </span>      <span class="Comment">// products coerced from callee to call</span>
 <span id="L307" class="LineNr">307 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> callee<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L308" class="LineNr">308 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L309" class="LineNr">309 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  ['&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' vs '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>callee<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;']</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L308" class="LineNr">308 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L309" class="LineNr">309 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  ['&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' vs '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>callee<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;']</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L310" class="LineNr">310 </span>      <span class="Delimiter">}</span>
 <span id="L311" class="LineNr">311 </span>    <span class="Delimiter">}</span>
 <span id="L312" class="LineNr">312 </span>  <span class="Delimiter">}</span>
@@ -397,17 +397,17 @@ if ('onhashchange' in window) {
 <span id="L332" class="LineNr">332 </span><span class="Normal">void</span> check_return_instructions_against_header<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L333" class="LineNr">333 </span>  <span class="Normal">const</span> recipe&amp; caller_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller_recipe<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- checking return instructions against header for &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- checking return instructions against header for &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L336" class="LineNr">336 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L337" class="LineNr">337 </span>    <span class="Normal">const</span> instruction&amp; inst = caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L338" class="LineNr">338 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;reply&quot;</span> &amp;&amp; inst<span class="Delimiter">.</span>name != <span class="Constant">&quot;return&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L339" class="LineNr">339 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L340" class="LineNr">340 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replied with the wrong number of products at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L340" class="LineNr">340 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replied with the wrong number of products at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L341" class="LineNr">341 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L342" class="LineNr">342 </span>    <span class="Delimiter">}</span>
 <span id="L343" class="LineNr">343 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L344" class="LineNr">344 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L345" class="LineNr">345 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replied with the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L345" class="LineNr">345 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replied with the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L346" class="LineNr">346 </span>    <span class="Delimiter">}</span>
 <span id="L347" class="LineNr">347 </span>  <span class="Delimiter">}</span>
 <span id="L348" class="LineNr">348 </span><span class="Delimiter">}</span>
@@ -468,12 +468,12 @@ if ('onhashchange' in window) {
 <span id="L403" class="LineNr">403 </span><span class="Normal">void</span> check_header_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L404" class="LineNr">404 </span>  recipe&amp; caller_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L405" class="LineNr">405 </span>  caller_recipe<span class="Delimiter">.</span>ingredient_index<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- checking return instructions against header for &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- checking return instructions against header for &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L407" class="LineNr">407 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L408" class="LineNr">408 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type == <span class="Constant">NULL</span><span class="Delimiter">)</span>
-<span id="L409" class="LineNr">409 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient '&quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has no type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L409" class="LineNr">409 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient '&quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has no type</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L410" class="LineNr">410 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredient_index<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span>
-<span id="L411" class="LineNr">411 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' can't repeat in the ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L411" class="LineNr">411 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' can't repeat in the ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L412" class="LineNr">412 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredient_index<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">,</span> i<span class="Delimiter">);</span>
 <span id="L413" class="LineNr">413 </span>  <span class="Delimiter">}</span>
 <span id="L414" class="LineNr">414 </span><span class="Delimiter">}</span>
@@ -500,37 +500,37 @@ if ('onhashchange' in window) {
 <span id="L435" class="LineNr">435 </span><span class="Normal">void</span> deduce_types_from_header<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L436" class="LineNr">436 </span>  recipe&amp; caller_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L437" class="LineNr">437 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L438" class="LineNr">438 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- deduce types from header for &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L438" class="LineNr">438 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- deduce types from header for &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L439" class="LineNr">439 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt; header_type<span class="Delimiter">;</span>
 <span id="L440" class="LineNr">440 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L441" class="LineNr">441 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error handled elsewhere</span>
 <span id="L442" class="LineNr">442 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>header_type<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
-<span id="L443" class="LineNr">443 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
 <span id="L445" class="LineNr">445 </span>  <span class="Normal">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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L446" class="LineNr">446 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error handled elsewhere</span>
 <span id="L447" class="LineNr">447 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>header_type<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">);</span>
-<span id="L448" class="LineNr">448 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L448" class="LineNr">448 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L449" class="LineNr">449 </span>  <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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L451" class="LineNr">451 </span>    instruction&amp; inst = caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L452" class="LineNr">452 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L452" class="LineNr">452 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L453" class="LineNr">453 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L454" class="LineNr">454 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L455" class="LineNr">455 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>header_type<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">)</span> == header_type<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span>
+<span id="L455" class="LineNr">455 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>header_type<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">)</span> == header_type<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span>
 <span id="L456" class="LineNr">456 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L457" class="LineNr">457 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>header_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error handled elsewhere</span>
 <span id="L458" class="LineNr">458 </span>      inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*get<span class="Delimiter">(</span>header_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L459" class="LineNr">459 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L459" class="LineNr">459 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L460" class="LineNr">460 </span>    <span class="Delimiter">}</span>
 <span id="L461" class="LineNr">461 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L462" class="LineNr">462 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L462" class="LineNr">462 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  product: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L463" class="LineNr">463 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L464" class="LineNr">464 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>header_type<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">)</span> == header_type<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span>
+<span id="L464" class="LineNr">464 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>header_type<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">)</span> == header_type<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span>
 <span id="L465" class="LineNr">465 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L466" class="LineNr">466 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>header_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// error handled elsewhere</span>
 <span id="L467" class="LineNr">467 </span>      inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*get<span class="Delimiter">(</span>header_type<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">));</span>
-<span id="L468" class="LineNr">468 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L469" class="LineNr">469 </span>    <span class="Delimiter">}</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Delimiter">}</span>
 <span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span>
@@ -556,7 +556,7 @@ if ('onhashchange' in window) {
 <span id="L491" class="LineNr">491 </span><span class="Delimiter">:(code)</span>
 <span id="L492" class="LineNr">492 </span><span class="Normal">void</span> fill_in_return_ingredients<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L493" class="LineNr">493 </span>  recipe&amp; caller_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- fill in return ingredients from header for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- fill in return ingredients from header for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L495" class="LineNr">495 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller_recipe<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L496" class="LineNr">496 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L497" class="LineNr">497 </span>    instruction&amp; inst = caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
@@ -689,12 +689,12 @@ if ('onhashchange' in window) {
 <span id="L624" class="LineNr">624 </span><span class="Normal">void</span> check_recipe_header_constraints<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L625" class="LineNr">625 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L626" class="LineNr">626 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name != <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L627" class="LineNr">627 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;check <a href='010vm.cc.html#L19'>recipe</a> header constraints for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L627" class="LineNr">627 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;check <a href='010vm.cc.html#L19'>recipe</a> header constraints for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L628" class="LineNr">628 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L629" class="LineNr">629 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> expected_ingredient<span class="Delimiter">(</span><span class="Constant">&quot;x:<a href='043space.cc.html#L101'>address</a>:array:character&quot;</span><span class="Delimiter">);</span>
 <span id="L630" class="LineNr">630 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L631" class="LineNr">631 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>expected_ingredient<span class="Delimiter">,</span> caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L632" class="LineNr">632 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;ingredients of <a href='010vm.cc.html#L19'>recipe</a> 'main' must all be text (address:array:character)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L632" class="LineNr">632 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;ingredients of <a href='010vm.cc.html#L19'>recipe</a> 'main' must all be text (address:array:character)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L633" class="LineNr">633 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L634" class="LineNr">634 </span>    <span class="Delimiter">}</span>
 <span id="L635" class="LineNr">635 </span>  <span class="Delimiter">}</span>
@@ -702,7 +702,7 @@ if ('onhashchange' in window) {
 <span id="L637" class="LineNr">637 </span>  reagent<span class="Comment">/*</span><span class="Comment">local</span><span class="Comment">*/</span> expected_product<span class="Delimiter">(</span><span class="Constant">&quot;x:number&quot;</span><span class="Delimiter">);</span>
 <span id="L638" class="LineNr">638 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>nprod &gt; <span class="Constant">1</span>
 <span id="L639" class="LineNr">639 </span>      || <span class="Delimiter">(</span>nprod == <span class="Constant">1</span> &amp;&amp; !types_strictly_match<span class="Delimiter">(</span>expected_product<span class="Delimiter">,</span> caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))))</span> <span class="Delimiter">{</span>
-<span id="L640" class="LineNr">640 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe 'main' must return at most a single product, a number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L640" class="LineNr">640 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;recipe 'main' must return at most a single product, a number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L641" class="LineNr">641 </span>  <span class="Delimiter">}</span>
 <span id="L642" class="LineNr">642 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index d7e54744..72eebcac 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -106,7 +106,7 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>      <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<span class="Delimiter">,</span> Next_recipe_ordinal++<span class="Delimiter">);</span>
 <span id="L42" class="LineNr"> 42 </span>      <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> result<span class="Delimiter">.</span>name<span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> new_name<span class="Delimiter">));</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="Delimiter">}</span>
-<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; new_name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; new_name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L45" class="LineNr"> 45 </span>    result<span class="Delimiter">.</span>name = new_name<span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>    result<span class="Delimiter">.</span>is_autogenerated =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
@@ -164,9 +164,9 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span> &amp;&amp; b<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
 <span id="L100" class="LineNr">100 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>a<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
-<span id="L102" class="LineNr">102 </span>      <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>b<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>b<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L103" class="LineNr">103 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>b<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
-<span id="L104" class="LineNr">104 </span>      <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>a<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span>      <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>a<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L105" class="LineNr">105 </span>    <span class="Identifier">return</span> a<span class="Delimiter">-&gt;</span>name == b<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Identifier">return</span> deeply_equal_type_names<span class="Delimiter">(</span>a<span class="Delimiter">-&gt;</span>left<span class="Delimiter">,</span> b<span class="Delimiter">-&gt;</span>left<span class="Delimiter">)</span>
@@ -227,7 +227,7 @@ if ('onhashchange' in window) {
 <span id="L162" class="LineNr">162 </span><span class="Delimiter">:(code)</span>
 <span id="L163" class="LineNr">163 </span><span class="Normal">void</span> <a href='054static_dispatch.cc.html#L163'>resolve_ambiguous_calls</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L164" class="LineNr">164 </span>  recipe&amp; caller_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L165" class="LineNr">165 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- resolve ambiguous calls for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L165" class="LineNr">165 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- resolve ambiguous calls for <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L167" class="LineNr">167 </span>    instruction&amp; inst = caller_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L168" class="LineNr">168 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -238,7 +238,7 @@ if ('onhashchange' in window) {
 <span id="L173" class="LineNr">173 </span><span class="Normal">void</span> <a href='054static_dispatch.cc.html#L173'>resolve_ambiguous_call</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> <span class="Normal">int</span> index<span class="Delimiter">,</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L174" class="LineNr">174 </span>  <span class="Comment">// End resolve_ambiguous_call(r, index, inst, caller_recipe) Special-cases</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L326'>non_ghost_size</a><span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">))</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction &quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction &quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L177" class="LineNr">177 </span>  Resolve_stack<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>r<span class="Delimiter">,</span> index<span class="Delimiter">));</span>
 <span id="L178" class="LineNr">178 </span>  string new_name = best_variant<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!new_name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
@@ -270,30 +270,30 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr">205 </span>  <span class="Comment">// error messages</span>
 <span id="L206" class="LineNr">206 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_primitive<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">)))</span> <span class="Delimiter">{</span>  <span class="Comment">// we currently don't check types for primitive variants</span>
 <span id="L207" class="LineNr">207 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variants<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;types don't match in call for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L209" class="LineNr">209 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  which tries to call '&quot;</span> &lt;&lt; original_header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L208" class="LineNr">208 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;types don't match in call for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L209" class="LineNr">209 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  which tries to call '&quot;</span> &lt;&lt; original_header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L210" class="LineNr">210 </span>    <span class="Delimiter">}</span>
 <span id="L211" class="LineNr">211 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to find a matching call for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  available variants are:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to find a matching call for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  available variants are:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L214" class="LineNr">214 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L215" class="LineNr">215 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; <a href='054static_dispatch.cc.html#L501'>original_header_label</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;    &quot;</span> &lt;&lt; <a href='054static_dispatch.cc.html#L501'>original_header_label</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L216" class="LineNr">216 </span>    <span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;call&gt;::iterator p = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span>++Resolve_stack<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Resolve_stack<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L217" class="LineNr">217 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>list&lt;call&gt;::iterator p = <span class="Comment">/*</span><span class="Comment">skip</span><span class="Comment">*/</span>++Resolve_stack<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Resolve_stack<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L218" class="LineNr">218 </span>      <span class="Normal">const</span> recipe&amp; specializer_recipe = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">);</span>
 <span id="L219" class="LineNr">219 </span>      <span class="Normal">const</span> instruction&amp; specializer_inst = specializer_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>running_step_index<span class="Delimiter">);</span>
 <span id="L220" class="LineNr">220 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>name != <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>
-<span id="L221" class="LineNr">221 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L221" class="LineNr">221 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L222" class="LineNr">222 </span>      <span class="Normal">else</span>
-<span id="L223" class="LineNr">223 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L223" class="LineNr">223 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>specializer_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L224" class="LineNr">224 </span>      <span class="Comment">// One special-case to help with the rewrite_stash transform. (cross-layer)</span>
 <span id="L225" class="LineNr">225 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot;stash_&quot;</span><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L226" class="LineNr">226 </span>        <a href='010vm.cc.html#L33'>instruction</a> stash_inst<span class="Delimiter">;</span>
 <span id="L227" class="LineNr">227 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L333'>next_stash</a><span class="Delimiter">(</span>*p<span class="Delimiter">,</span> &amp;stash_inst<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L228" class="LineNr">228 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>specializer_recipe<span class="Delimiter">.</span>name != <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>
-<span id="L229" class="LineNr">229 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L229" class="LineNr">229 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in &quot;</span> &lt;&lt; specializer_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L230" class="LineNr">230 </span>          <span class="Normal">else</span>
-<span id="L231" class="LineNr">231 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L231" class="LineNr">231 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (part of '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>stash_inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L232" class="LineNr">232 </span>        <span class="Delimiter">}</span>
 <span id="L233" class="LineNr">233 </span>      <span class="Delimiter">}</span>
 <span id="L234" class="LineNr">234 </span>    <span class="Delimiter">}</span>
@@ -306,7 +306,7 @@ if ('onhashchange' in window) {
 <span id="L241" class="LineNr">241 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
 <span id="L242" class="LineNr">242 </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#L141'>SIZE</a><span class="Delimiter">(</span>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L243" class="LineNr">243 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant (strict) &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant (strict) &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L245" class="LineNr">245 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L251'>all_header_reagents_strictly_match</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
 <span id="L246" class="LineNr">246 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Delimiter">}</span>
@@ -316,14 +316,14 @@ if ('onhashchange' in window) {
 <span id="L251" class="LineNr">251 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L251'>all_header_reagents_strictly_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <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; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L253" class="LineNr">253 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L254" class="LineNr">254 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L254" class="LineNr">254 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L255" class="LineNr">255 </span>      <span class="Identifier">return</span><span class="Constant"> false</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 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; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L259" class="LineNr">259 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L260" class="LineNr">260 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L261" class="LineNr">261 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L261" class="LineNr">261 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;strict match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L262" class="LineNr">262 </span>      <span class="Identifier">return</span><span class="Constant"> false</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>
@@ -335,7 +335,7 @@ if ('onhashchange' in window) {
 <span id="L270" class="LineNr">270 </span>  vector&lt;recipe_ordinal&gt; result<span class="Delimiter">;</span>
 <span id="L271" class="LineNr">271 </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#L141'>SIZE</a><span class="Delimiter">(</span>variants<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L272" class="LineNr">272 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;checking variant &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L274" class="LineNr">274 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L280'>all_header_reagents_match</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))))</span>
 <span id="L275" class="LineNr">275 </span>      result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>variants<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
 <span id="L276" class="LineNr">276 </span>  <span class="Delimiter">}</span>
@@ -345,14 +345,14 @@ if ('onhashchange' in window) {
 <span id="L280" class="LineNr">280 </span><span class="Normal">bool</span> <a href='054static_dispatch.cc.html#L280'>all_header_reagents_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L281" class="LineNr">281 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L282" class="LineNr">282 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L283" class="LineNr">283 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L283" class="LineNr">283 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L284" class="LineNr">284 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L285" class="LineNr">285 </span>    <span class="Delimiter">}</span>
 <span id="L286" class="LineNr">286 </span>  <span class="Delimiter">}</span>
 <span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L290" class="LineNr">290 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L290" class="LineNr">290 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L291" class="LineNr">291 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L292" class="LineNr">292 </span>    <span class="Delimiter">}</span>
 <span id="L293" class="LineNr">293 </span>  <span class="Delimiter">}</span>
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index 4f4043a5..27314549 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -85,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">const</span> type_tree* get_base_type<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* t<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> type_tree* result = t<span class="Delimiter">-&gt;</span>atom ? t : t<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span>
-<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>t<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;invalid type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>t<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span>
 <span id="L26" class="LineNr"> 26 </span>
@@ -197,7 +197,7 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span>
 <span id="L133" class="LineNr">133 </span><span class="Delimiter">:(before &quot;End container Name Refinements&quot;)</span>
 <span id="L134" class="LineNr">134 </span><span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">':'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;container has type ingredients; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;container has type ingredients; parsing&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!read_type_ingredients<span class="Delimiter">(</span>name<span class="Delimiter">,</span> command<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L137" class="LineNr">137 </span>    <span class="Comment">// error; skip rest of the container definition and continue</span>
 <span id="L138" class="LineNr">138 </span>    <a href='016dilated_reagent.cc.html#L57'>slurp_balanced_bracket</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
@@ -219,7 +219,7 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span>    <span class="Normal">const</span> type_info&amp; previous_info = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> name<span class="Delimiter">));</span>
 <span id="L155" class="LineNr">155 </span>    <span class="Comment">// we've already seen this container; make sure type ingredients match</span>
 <span id="L156" class="LineNr">156 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!type_ingredients_match<span class="Delimiter">(</span>type_ingredient_names<span class="Delimiter">,</span> previous_info<span class="Delimiter">.</span>type_ingredient_names<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;headers of &quot;</span> &lt;&lt; command &lt;&lt; <span class="Constant">&quot; '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' must use identical type ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;headers of &quot;</span> &lt;&lt; command &lt;&lt; <span class="Constant">&quot; '&quot;</span> &lt;&lt; name &lt;&lt; <span class="Constant">&quot;' must use identical type ingredients</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L158" class="LineNr">158 </span>      <span class="Identifier">return</span><span class="Constant"> false</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="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
@@ -237,15 +237,15 @@ if ('onhashchange' in window) {
 <span id="L172" class="LineNr">172 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L239'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L173" class="LineNr">173 </span>    string curr = slurp_until<span class="Delimiter">(</span>in<span class="Delimiter">,</span> <span class="Constant">':'</span><span class="Delimiter">);</span>
 <span id="L174" class="LineNr">174 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L175" class="LineNr">175 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; container_name &lt;&lt; <span class="Constant">&quot;: empty type ingredients not permitted</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; container_name &lt;&lt; <span class="Constant">&quot;: empty type ingredients not permitted</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L176" class="LineNr">176 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L177" class="LineNr">177 </span>    <span class="Delimiter">}</span>
 <span id="L178" class="LineNr">178 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;_&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; container_name &lt;&lt; <span class="Constant">&quot;: type ingredient '&quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot;' must begin with an underscore</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; container_name &lt;&lt; <span class="Constant">&quot;: type ingredient '&quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot;' must begin with an underscore</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L180" class="LineNr">180 </span>      <span class="Identifier">return</span><span class="Constant"> false</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="Normal">if</span> <span class="Delimiter">(</span>out<span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> != out<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L183" class="LineNr">183 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; container_name &lt;&lt; <span class="Constant">&quot;: can't repeat type ingredient name'&quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot;' in a single container definition</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>out<span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> != out<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L183" class="LineNr">183 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; container_name &lt;&lt; <span class="Constant">&quot;: can't repeat type ingredient name'&quot;</span> &lt;&lt; curr &lt;&lt; <span class="Constant">&quot;' in a single container definition</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L184" class="LineNr">184 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L185" class="LineNr">185 </span>    <span class="Delimiter">}</span>
 <span id="L186" class="LineNr">186 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> next_type_ordinal++<span class="Delimiter">);</span>
@@ -255,7 +255,7 @@ if ('onhashchange' in window) {
 <span id="L190" class="LineNr">190 </span>
 <span id="L191" class="LineNr">191 </span><span class="Normal">bool</span> type_ingredients_match<span class="Delimiter">(</span><span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> type_ordinal&gt;&amp; a<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> type_ordinal&gt;&amp; b<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L192" class="LineNr">192 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> != <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>b<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt;::const_iterator p = a<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != a<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt;::const_iterator p = a<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != a<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L194" class="LineNr">194 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>b<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L195" class="LineNr">195 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second != get<span class="Delimiter">(</span>b<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Delimiter">}</span>
@@ -375,7 +375,7 @@ if ('onhashchange' in window) {
 <span id="L310" class="LineNr">310 </span><span class="Delimiter">:(before &quot;End size_of(type) Non-atom Special-cases&quot;)</span>
 <span id="L311" class="LineNr">311 </span>assert<span class="Delimiter">(</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L312" class="LineNr">312 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L313" class="LineNr">313 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;no such type &quot;</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L313" class="LineNr">313 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;no such type &quot;</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L315" class="LineNr">315 </span><span class="Delimiter">}</span>
 <span id="L316" class="LineNr">316 </span>type_info t = get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value<span class="Delimiter">);</span>
@@ -385,7 +385,7 @@ if ('onhashchange' in window) {
 <span id="L320" class="LineNr">320 </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#L141'>SIZE</a><span class="Delimiter">(</span>t<span class="Delimiter">.</span>elements<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L321" class="LineNr">321 </span>    <span class="Comment">// todo: strengthen assertion to disallow mutual type recursion</span>
 <span id="L322" class="LineNr">322 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>get_base_type<span class="Delimiter">(</span>t<span class="Delimiter">.</span>elements<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>type<span class="Delimiter">)-&gt;</span>value == get_base_type<span class="Delimiter">(</span>type<span class="Delimiter">)-&gt;</span>value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L323" class="LineNr">323 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;container &quot;</span> &lt;&lt; t<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't include itself as a member</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L323" class="LineNr">323 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;container &quot;</span> &lt;&lt; t<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; can't include itself as a member</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L324" class="LineNr">324 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L325" class="LineNr">325 </span>    <span class="Delimiter">}</span>
 <span id="L326" class="LineNr">326 </span>    result += size_of<span class="Delimiter">(</span><a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> i<span class="Delimiter">));</span>
@@ -433,7 +433,7 @@ if ('onhashchange' in window) {
 <span id="L368" class="LineNr">368 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>reagent&amp; element<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* caller_type<span class="Delimiter">,</span> <span class="Normal">const</span> type_info&amp; info<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L369" class="LineNr">369 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>contains_type_ingredient<span class="Delimiter">(</span>element<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L370" class="LineNr">370 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!caller_type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">)</span>
-<span id="L371" class="LineNr">371 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal type &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>caller_type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; seems to be missing a type ingredient or three&quot;</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L371" class="LineNr">371 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal type &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>caller_type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; seems to be missing a type ingredient or three&quot;</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L372" class="LineNr">372 </span>    replace_type_ingredients<span class="Delimiter">(</span>element<span class="Delimiter">.</span>type<span class="Delimiter">,</span> caller_type<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> info<span class="Delimiter">,</span> location_for_error_messages<span class="Delimiter">);</span>
 <span id="L373" class="LineNr">373 </span>  <span class="Delimiter">}</span>
 <span id="L374" class="LineNr">374 </span><span class="Delimiter">}</span>
@@ -461,11 +461,11 @@ if ('onhashchange' in window) {
 <span id="L396" class="LineNr">396 </span>
 <span id="L397" class="LineNr">397 </span><span class="Normal">const</span> type_tree* corresponding<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">,</span> <span class="Normal">int</span> index<span class="Delimiter">,</span> <span class="Normal">bool</span> <span class="Normal">final</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L398" class="LineNr">398 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">const</span> type_tree* curr = type<span class="Delimiter">;</span>  curr<span class="Delimiter">;</span>  curr = curr<span class="Delimiter">-&gt;</span>right<span class="Delimiter">,</span> --index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L399" class="LineNr">399 </span>    <a href='003trace.cc.html#L200'>assert_for_now</a><span class="Delimiter">(</span>!curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L399" class="LineNr">399 </span>    <a href='003trace.cc.html#L199'>assert_for_now</a><span class="Delimiter">(</span>!curr<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L400" class="LineNr">400 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>index == <span class="Constant">0</span><span class="Delimiter">)</span>
 <span id="L401" class="LineNr">401 </span>      <span class="Identifier">return</span> <span class="Normal">final</span> ? curr : curr<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L402" class="LineNr">402 </span>  <span class="Delimiter">}</span>
-<span id="L403" class="LineNr">403 </span>  <a href='003trace.cc.html#L200'>assert_for_now</a><span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L403" class="LineNr">403 </span>  <a href='003trace.cc.html#L199'>assert_for_now</a><span class="Delimiter">(</span><span class="Constant">false</span><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="Normal">bool</span> is_type_ingredient<span class="Delimiter">(</span><span class="Normal">const</span> type_tree* type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -479,7 +479,7 @@ if ('onhashchange' in window) {
 <span id="L414" class="LineNr">414 </span>
 <span id="L415" class="LineNr">415 </span><span class="Normal">void</span> replace_type_ingredient_at<span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">int</span> type_ingredient_index<span class="Delimiter">,</span> type_tree* <a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">,</span> <span class="Normal">const</span> type_tree* callsite_type<span class="Delimiter">,</span> <span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; location_for_error_messages<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L416" class="LineNr">416 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_nth_type<span class="Delimiter">(</span>callsite_type<span class="Delimiter">,</span> type_ingredient_index<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L417" class="LineNr">417 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal type &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>callsite_type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; seems to be missing a type ingredient or three&quot;</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L417" class="LineNr">417 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal type &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>callsite_type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; seems to be missing a type ingredient or three&quot;</span> &lt;&lt; location_for_error_messages &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L418" class="LineNr">418 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L419" class="LineNr">419 </span>  <span class="Delimiter">}</span>
 <span id="L420" class="LineNr">420 </span>  *element_type = *nth_type_ingredient<span class="Delimiter">(</span>callsite_type<span class="Delimiter">,</span> type_ingredient_index<span class="Delimiter">,</span> container_info<span class="Delimiter">);</span>
@@ -503,7 +503,7 @@ if ('onhashchange' in window) {
 <span id="L438" class="LineNr">438 </span>
 <span id="L439" class="LineNr">439 </span><span class="Normal">bool</span> is_final_type_ingredient<span class="Delimiter">(</span><span class="Normal">int</span> type_ingredient_index<span class="Delimiter">,</span> <span class="Normal">const</span> type_info&amp; container_info<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L440" class="LineNr">440 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> type_ordinal&gt;::const_iterator p = container_info<span class="Delimiter">.</span>type_ingredient_names<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L441" class="LineNr">441 </span>       p != container_info<span class="Delimiter">.</span>type_ingredient_names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>       p != container_info<span class="Delimiter">.</span>type_ingredient_names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L442" class="LineNr">442 </span>       ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L443" class="LineNr">443 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second &gt; START_TYPE_INGREDIENTS+type_ingredient_index<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index f3c43d60..498320b6 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L37" class="LineNr">  37 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_step_index == <span class="Constant">0</span>
 <span id="L38" class="LineNr">  38 </span>    &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L156'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>front<span class="Delimiter">().</span>running_recipe<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L39" class="LineNr">  39 </span><span class="CommentedCode">//?   DUMP(&quot;&quot;);</span>
-<span id="L40" class="LineNr">  40 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;ran into unspecialized shape-shifting <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr">  40 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;ran into unspecialized shape-shifting <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; <a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr">  41 </span><span class="CommentedCode">//?   exit(0);</span>
 <span id="L42" class="LineNr">  42 </span><span class="Delimiter">}</span>
 <span id="L43" class="LineNr">  43 </span>
@@ -115,10 +115,10 @@ if ('onhashchange' in window) {
 <span id="L50" class="LineNr">  50 </span>candidates = <a href='056shape_shifting_recipe.cc.html#L73'>strictly_matching_shape_shifting_variants</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> variants<span class="Delimiter">);</span>
 <span id="L51" class="LineNr">  51 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!candidates<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L52" class="LineNr">  52 </span>  <a href='010vm.cc.html#L14'>recipe_ordinal</a> exemplar = <a href='056shape_shifting_recipe.cc.html#L106'>best_shape_shifting_variant</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> candidates<span class="Delimiter">);</span>
-<span id="L53" class="LineNr">  53 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;found variant to specialize: &quot;</span> &lt;&lt; exemplar &lt;&lt; <span class="Constant">' '</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L53" class="LineNr">  53 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;found variant to specialize: &quot;</span> &lt;&lt; exemplar &lt;&lt; <span class="Constant">' '</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L54" class="LineNr">  54 </span>  string new_recipe_name = <a href='056shape_shifting_recipe.cc.html#L241'>insert_new_variant</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">,</span> inst<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
 <span id="L55" class="LineNr">  55 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>new_recipe_name != <span class="Constant">&quot;&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L56" class="LineNr">  56 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new specialization: &quot;</span> &lt;&lt; new_recipe_name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L56" class="LineNr">  56 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new specialization: &quot;</span> &lt;&lt; new_recipe_name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr">  57 </span>    <span class="Identifier">return</span> new_recipe_name<span class="Delimiter">;</span>
 <span id="L58" class="LineNr">  58 </span>  <span class="Delimiter">}</span>
 <span id="L59" class="LineNr">  59 </span><span class="Delimiter">}</span>
@@ -129,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L64" class="LineNr">  64 </span><span class="Delimiter">:(before &quot;End Instruction Operation Checks&quot;)</span>
 <span id="L65" class="LineNr">  65 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> &amp;&amp; !is_primitive<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span>
 <span id="L66" class="LineNr">  66 </span>    &amp;&amp; <a href='056shape_shifting_recipe.cc.html#L156'>any_type_ingredient_in_header</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L67" class="LineNr">  67 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has no valid specialization</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L67" class="LineNr">  67 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' has no valid specialization</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L68" class="LineNr">  68 </span>  <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L69" class="LineNr">  69 </span><span class="Delimiter">}</span>
 <span id="L70" class="LineNr">  70 </span>
@@ -149,14 +149,14 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr">  84 </span><span class="Normal">bool</span> <a href='056shape_shifting_recipe.cc.html#L84'>all_concrete_header_reagents_strictly_match</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L85" class="LineNr">  85 </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; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L86" class="LineNr">  86 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!concrete_type_names_strictly_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr">  87 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;concrete-type match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr">  87 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;concrete-type match failed: ingredient &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr">  88 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr">  89 </span>    <span class="Delimiter">}</span>
 <span id="L90" class="LineNr">  90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr">  91 </span>  <span 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; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L92" class="LineNr">  92 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L93" class="LineNr">  93 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!concrete_type_names_strictly_match<span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L94" class="LineNr">  94 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;concrete-type match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr">  94 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;concrete-type match failed: product &quot;</span> &lt;&lt; i &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr">  95 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L96" class="LineNr">  96 </span>    <span class="Delimiter">}</span>
 <span id="L97" class="LineNr">  97 </span>  <span class="Delimiter">}</span>
@@ -182,7 +182,7 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr"> 117 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;C picking shape-shifting variant:\n&quot;;</span>
 <span id="L118" class="LineNr"> 118 </span>  vector&lt;recipe_ordinal&gt; result3 = <a href='056shape_shifting_recipe.cc.html#L128'>keep_max</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> result2<span class="Delimiter">,</span> number_of_type_ingredients<span class="Delimiter">);</span>
 <span id="L119" class="LineNr"> 119 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>result3<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L120" class="LineNr"> 120 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">Couldn't decide the best shape-shifting variant for instruction '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L120" class="LineNr"> 120 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">Couldn't decide the best shape-shifting variant for instruction '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L121" class="LineNr"> 121 </span>    cerr &lt;&lt; <span class="Constant">&quot;This is a hole in Mu. Please copy the following candidates into an email to Kartik Agaram &lt;mu@akkartik.com&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L122" class="LineNr"> 122 </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#L141'>SIZE</a><span class="Delimiter">(</span>candidates<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L123" class="LineNr"> 123 </span>      cerr &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> candidates<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
@@ -250,9 +250,9 @@ if ('onhashchange' in window) {
 <span id="L185" class="LineNr"> 185 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>atom != to<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L186" class="LineNr"> 186 </span>  <span class="Comment">// both from and to are atoms</span>
 <span id="L187" class="LineNr"> 187 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
-<span id="L188" class="LineNr"> 188 </span>    <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L188" class="LineNr"> 188 </span>    <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L189" class="LineNr"> 189 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>to<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;literal&quot;</span><span class="Delimiter">)</span>
-<span id="L190" class="LineNr"> 190 </span>    <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L190" class="LineNr"> 190 </span>    <span class="Identifier">return</span> Literal_type_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">)</span> != Literal_type_names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L191" class="LineNr"> 191 </span>  <span class="Identifier">return</span> to<span class="Delimiter">-&gt;</span>name == from<span class="Delimiter">-&gt;</span>name<span class="Delimiter">;</span>
 <span id="L192" class="LineNr"> 192 </span><span class="Delimiter">}</span>
 <span id="L193" class="LineNr"> 193 </span>
@@ -315,10 +315,10 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr"> 250 </span>  new_recipe<span class="Delimiter">.</span>name = new_name<span class="Delimiter">;</span>
 <span id="L251" class="LineNr"> 251 </span>  new_recipe<span class="Delimiter">.</span>ordinal = new_recipe_ordinal<span class="Delimiter">;</span>
 <span id="L252" class="LineNr"> 252 </span>  new_recipe<span class="Delimiter">.</span>is_autogenerated =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L253" class="LineNr"> 253 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to specialized &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>new_recipe<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L253" class="LineNr"> 253 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;switching &quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; to specialized &quot;</span> &lt;&lt; header_label<span class="Delimiter">(</span>new_recipe<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L254" class="LineNr"> 254 </span>
-<span id="L255" class="LineNr"> 255 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;transforming new specialization: &quot;</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L256" class="LineNr"> 256 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: performing transforms until check_or_set_types_by_name&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr"> 255 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;transforming new specialization: &quot;</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L256" class="LineNr"> 256 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: performing transforms until check_or_set_types_by_name&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L257" class="LineNr"> 257 </span>  <span class="Normal">int</span> transform_index = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L258" class="LineNr"> 258 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>transform_index = <span class="Constant">0</span><span class="Delimiter">;</span>  transform_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Transform<span class="Delimiter">);</span>  ++transform_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L259" class="LineNr"> 259 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>transform_index<span class="Delimiter">)</span> == <a href='046check_type_by_name.cc.html#L35'>check_or_set_types_by_name</a><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -326,26 +326,26 @@ if ('onhashchange' in window) {
 <span id="L261" class="LineNr"> 261 </span>  <span class="Delimiter">}</span>
 <span id="L262" class="LineNr"> 262 </span>  new_recipe<span class="Delimiter">.</span>transformed_until = transform_index-<span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L263" class="LineNr"> 263 </span>
-<span id="L264" class="LineNr"> 264 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: performing type-ingredient-aware version of <a href='012transform.cc.html#L99'>transform</a> check_or_set_types_by_name&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L264" class="LineNr"> 264 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: performing type-ingredient-aware version of <a href='012transform.cc.html#L99'>transform</a> check_or_set_types_by_name&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L265" class="LineNr"> 265 </span>  <a href='056shape_shifting_recipe.cc.html#L290'>compute_type_names</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">);</span>
 <span id="L266" class="LineNr"> 266 </span>  new_recipe<span class="Delimiter">.</span>transformed_until++<span class="Delimiter">;</span>
 <span id="L267" class="LineNr"> 267 </span>
-<span id="L268" class="LineNr"> 268 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: replacing type ingredients&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L268" class="LineNr"> 268 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: replacing type ingredients&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L269" class="LineNr"> 269 </span>  <span class="Delimiter">{</span>
 <span id="L270" class="LineNr"> 270 </span>    map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt; mappings<span class="Delimiter">;</span>
 <span id="L271" class="LineNr"> 271 </span>    <span class="Normal">bool</span> error =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L272" class="LineNr"> 272 </span>    <a href='056shape_shifting_recipe.cc.html#L328'>compute_type_ingredient_mappings</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">),</span> inst<span class="Delimiter">,</span> mappings<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">,</span> &amp;error<span class="Delimiter">);</span>
 <span id="L273" class="LineNr"> 273 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!error<span class="Delimiter">)</span> error = <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>mappings<span class="Delimiter">)</span> != <a href='056shape_shifting_recipe.cc.html#L466'>type_ingredient_count_in_header</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">));</span>
 <span id="L274" class="LineNr"> 274 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!error<span class="Delimiter">)</span> replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
-<span id="L275" class="LineNr"> 275 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;::iterator p = mappings<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != mappings<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L275" class="LineNr"> 275 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;::iterator p = mappings<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != mappings<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L276" class="LineNr"> 276 </span>      <span class="Normal">delete</span> p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
 <span id="L277" class="LineNr"> 277 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>error<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
 <span id="L278" class="LineNr"> 278 </span>  <span class="Delimiter">}</span>
 <span id="L279" class="LineNr"> 279 </span>  ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> exemplar<span class="Delimiter">));</span>
 <span id="L280" class="LineNr"> 280 </span>
-<span id="L281" class="LineNr"> 281 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: recording the new variant before recursively calling resolve_ambiguous_calls&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L281" class="LineNr"> 281 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: recording the new variant before recursively calling resolve_ambiguous_calls&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L282" class="LineNr"> 282 </span>  get<span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>new_recipe_ordinal<span class="Delimiter">);</span>
-<span id="L283" class="LineNr"> 283 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: performing remaining transforms (including resolve_ambiguous_calls)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L283" class="LineNr"> 283 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: performing remaining transforms (including resolve_ambiguous_calls)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L284" class="LineNr"> 284 </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>  transform_index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Transform<span class="Delimiter">);</span>  ++transform_index<span class="Delimiter">)</span>
 <span id="L285" class="LineNr"> 285 </span>    <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>transform_index<span class="Delimiter">))(</span>new_recipe_ordinal<span class="Delimiter">);</span>
 <span id="L286" class="LineNr"> 286 </span>  new_recipe<span class="Delimiter">.</span>transformed_until = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>Transform<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">;</span>
@@ -353,7 +353,7 @@ if ('onhashchange' in window) {
 <span id="L288" class="LineNr"> 288 </span><span class="Delimiter">}</span>
 <span id="L289" class="LineNr"> 289 </span>
 <span id="L290" class="LineNr"> 290 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L290'>compute_type_names</a><span class="Delimiter">(</span>recipe&amp; variant<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L291" class="LineNr"> 291 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute type names: &quot;</span> &lt;&lt; variant<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr"> 291 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute type names: &quot;</span> &lt;&lt; variant<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L292" class="LineNr"> 292 </span>  map&lt;string<span class="Delimiter">,</span> type_tree*&gt; type_names<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> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L294" class="LineNr"> 294 </span>    <a href='056shape_shifting_recipe.cc.html#L307'>save_or_deduce_type_name</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
@@ -361,7 +361,7 @@ if ('onhashchange' in window) {
 <span id="L296" class="LineNr"> 296 </span>    <a href='056shape_shifting_recipe.cc.html#L307'>save_or_deduce_type_name</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L297" class="LineNr"> 297 </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#L141'>SIZE</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L298" class="LineNr"> 298 </span>    instruction&amp; inst = variant<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L299" class="LineNr"> 299 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  <a href='010vm.cc.html#L33'>instruction</a>: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L299" class="LineNr"> 299 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;  <a href='010vm.cc.html#L33'>instruction</a>: &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L300" class="LineNr"> 300 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> in = <span class="Constant">0</span><span class="Delimiter">;</span>  in &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++in<span class="Delimiter">)</span>
 <span id="L301" class="LineNr"> 301 </span>      <a href='056shape_shifting_recipe.cc.html#L307'>save_or_deduce_type_name</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>in<span class="Delimiter">),</span> type_names<span class="Delimiter">,</span> variant<span class="Delimiter">,</span> <span class="Constant">&quot; in '&quot;</span> + to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> + <span class="Constant">&quot;'&quot;</span><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> out = <span class="Constant">0</span><span class="Delimiter">;</span>  out &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++out<span class="Delimiter">)</span>
@@ -370,10 +370,10 @@ if ('onhashchange' in window) {
 <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='056shape_shifting_recipe.cc.html#L307'>save_or_deduce_type_name</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> type_tree*&gt;&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; variant<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; context<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L308" class="LineNr"> 308 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    checking &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L308" class="LineNr"> 308 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    checking &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L309" class="LineNr"> 309 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type &amp;&amp; <a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L310" class="LineNr"> 310 </span>    x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*get<span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
-<span id="L311" class="LineNr"> 311 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    deducing type to &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L311" class="LineNr"> 311 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9994</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;    deducing type to &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L312" class="LineNr"> 312 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L313" class="LineNr"> 313 </span>  <span class="Delimiter">}</span>
 <span id="L314" class="LineNr"> 314 </span>  <span class="Comment">// Type Check in Type-ingredient-aware check_or_set_types_by_name</span>
@@ -381,13 +381,13 @@ if ('onhashchange' in window) {
 <span id="L316" class="LineNr"> 316 </span>  <span class="Comment">// We've found it useful in the past for tracking down bugs in</span>
 <span id="L317" class="LineNr"> 317 </span>  <span class="Comment">// specialization.</span>
 <span id="L318" class="LineNr"> 318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr"> 319 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>original_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; context &lt;&lt; <span class="Constant">&quot; (check the name for typos)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L319" class="LineNr"> 319 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>variant<span class="Delimiter">.</span>original_name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unknown type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; context &lt;&lt; <span class="Constant">&quot; (check the name for typos)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L320" class="LineNr"> 320 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L323" class="LineNr"> 323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;offset&quot;</span> || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>name == <span class="Constant">&quot;variant&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// special-case for container-access instructions</span>
 <span id="L324" class="LineNr"> 324 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>type<span class="Delimiter">,</span> x<span class="Delimiter">.</span>name<span class="Delimiter">,</span> x<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
-<span id="L325" class="LineNr"> 325 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L325" class="LineNr"> 325 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;type of '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' is &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L326" class="LineNr"> 326 </span><span class="Delimiter">}</span>
 <span id="L327" class="LineNr"> 327 </span>
 <span id="L328" class="LineNr"> 328 </span><span class="Normal">void</span> <a href='056shape_shifting_recipe.cc.html#L328'>compute_type_ingredient_mappings</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">,</span> <span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller_recipe<span class="Delimiter">,</span> <span class="Normal">bool</span>* error<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -419,13 +419,13 @@ if ('onhashchange' in window) {
 <span id="L354" class="LineNr"> 354 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!refinement_type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L355" class="LineNr"> 355 </span>    <span class="Comment">// probably a bug in mu</span>
 <span id="L356" class="LineNr"> 356 </span>    <span class="Comment">// todo: make this smarter; only flag an error if exemplar_type contains some *new* type ingredient</span>
-<span id="L357" class="LineNr"> 357 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type ingredient for &quot;</span> &lt;&lt; exemplar_reagent<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L358" class="LineNr"> 358 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  (called from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L357" class="LineNr"> 357 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type ingredient for &quot;</span> &lt;&lt; exemplar_reagent<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L358" class="LineNr"> 358 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  (called from '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L359" class="LineNr"> 359 </span>    <span class="Identifier">return</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="Normal">if</span> <span class="Delimiter">(</span>!exemplar_type<span class="Delimiter">-&gt;</span>atom &amp;&amp; exemplar_type<span class="Delimiter">-&gt;</span>right == <span class="Constant">NULL</span> &amp;&amp; !refinement_type<span class="Delimiter">-&gt;</span>atom &amp;&amp; refinement_type<span class="Delimiter">-&gt;</span>right != <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L362" class="LineNr"> 362 </span>    exemplar_type = exemplar_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
-<span id="L363" class="LineNr"> 363 </span>    <a href='003trace.cc.html#L200'>assert_for_now</a><span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
+<span id="L363" class="LineNr"> 363 </span>    <a href='003trace.cc.html#L199'>assert_for_now</a><span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">);</span>
 <span id="L364" class="LineNr"> 364 </span>  <span class="Delimiter">}</span>
 <span id="L365" class="LineNr"> 365 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L366" class="LineNr"> 366 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_type_ingredient_name<span class="Delimiter">(</span>exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
@@ -437,12 +437,12 @@ if ('onhashchange' in window) {
 <span id="L372" class="LineNr"> 372 </span>        curr_refinement_type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*refinement_type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">);</span>
 <span id="L373" class="LineNr"> 373 </span>      <span class="Delimiter">}</span>
 <span id="L374" class="LineNr"> 374 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L375" class="LineNr"> 375 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;adding mapping from &quot;</span> &lt;&lt; exemplar_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>curr_refinement_type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L375" class="LineNr"> 375 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;adding mapping from &quot;</span> &lt;&lt; exemplar_type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>curr_refinement_type<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L376" class="LineNr"> 376 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">,</span> <span class="Normal">new</span> type_tree<span class="Delimiter">(</span>*curr_refinement_type<span class="Delimiter">));</span>
 <span id="L377" class="LineNr"> 377 </span>      <span class="Delimiter">}</span>
 <span id="L378" class="LineNr"> 378 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L379" class="LineNr"> 379 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!deeply_equal_type_names<span class="Delimiter">(</span>get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> exemplar_type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">),</span> curr_refinement_type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L380" class="LineNr"> 380 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;no call found for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L380" class="LineNr"> 380 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;no call found for '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>call_instruction<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L381" class="LineNr"> 381 </span>          *error =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L382" class="LineNr"> 382 </span>          <span class="Normal">delete</span> curr_refinement_type<span class="Delimiter">;</span>
 <span id="L383" class="LineNr"> 383 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -464,16 +464,16 @@ if ('onhashchange' in window) {
 <span id="L399" class="LineNr"> 399 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>recipe&amp; new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L400" class="LineNr"> 400 </span>  <span class="Comment">// update its header</span>
 <span id="L401" class="LineNr"> 401 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mappings<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L402" class="LineNr"> 402 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header ingredients&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L402" class="LineNr"> 402 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header ingredients&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L403" class="LineNr"> 403 </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#L141'>SIZE</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L404" class="LineNr"> 404 </span>    replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
-<span id="L405" class="LineNr"> 405 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header products&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L405" class="LineNr"> 405 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L19'>recipe</a> header products&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L406" class="LineNr"> 406 </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#L141'>SIZE</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L407" class="LineNr"> 407 </span>    replace_type_ingredients<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
 <span id="L408" class="LineNr"> 408 </span>  <span class="Comment">// update its body</span>
 <span id="L409" class="LineNr"> 409 </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#L141'>SIZE</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L410" class="LineNr"> 410 </span>    instruction&amp; inst = new_recipe<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L411" class="LineNr"> 411 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L33'>instruction</a> '&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='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L411" class="LineNr"> 411 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in <a href='010vm.cc.html#L33'>instruction</a> '&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='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L412" class="LineNr"> 412 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L413" class="LineNr"> 413 </span>      replace_type_ingredients<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">),</span> mappings<span class="Delimiter">,</span> new_recipe<span class="Delimiter">);</span>
 <span id="L414" class="LineNr"> 414 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
@@ -490,9 +490,9 @@ if ('onhashchange' in window) {
 <span id="L425" class="LineNr"> 425 </span>
 <span id="L426" class="LineNr"> 426 </span><span class="Normal">void</span> replace_type_ingredients<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">const</span> type_tree*&gt;&amp; mappings<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L427" class="LineNr"> 427 </span>  string before = <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
-<span id="L428" class="LineNr"> 428 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in ingredient &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L428" class="LineNr"> 428 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;replacing in ingredient &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L429" class="LineNr"> 429 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L430" class="LineNr"> 430 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;specializing &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name &lt;&lt; <span class="Constant">&quot;: missing type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L430" class="LineNr"> 430 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;specializing &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name &lt;&lt; <span class="Constant">&quot;: missing type for '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L431" class="LineNr"> 431 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L432" class="LineNr"> 432 </span>  <span class="Delimiter">}</span>
 <span id="L433" class="LineNr"> 433 </span>  replace_type_ingredients<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">,</span> mappings<span class="Delimiter">);</span>
@@ -514,7 +514,7 @@ if ('onhashchange' in window) {
 <span id="L449" class="LineNr"> 449 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span>
 <span id="L450" class="LineNr"> 450 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L451" class="LineNr"> 451 </span>  <span class="Normal">const</span> type_tree* replacement = get<span class="Delimiter">(</span>mappings<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>name<span class="Delimiter">);</span>
-<span id="L452" class="LineNr"> 452 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>replacement<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L452" class="LineNr"> 452 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; type<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; names_to_string<span class="Delimiter">(</span>replacement<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L453" class="LineNr"> 453 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>replacement<span class="Delimiter">-&gt;</span>atom<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L454" class="LineNr"> 454 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Type_ordinal<span class="Delimiter">,</span> replacement<span class="Delimiter">-&gt;</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L455" class="LineNr"> 455 </span>      <span class="Comment">// error in program; should be reported elsewhere</span>
@@ -575,7 +575,7 @@ if ('onhashchange' in window) {
 <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="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> recipe&amp; new_recipe<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L513" class="LineNr"> 513 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- ensure all concrete types in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L513" class="LineNr"> 513 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- ensure all concrete types in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; new_recipe<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L514" class="LineNr"> 514 </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#L141'>SIZE</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L515" class="LineNr"> 515 </span>    ensure_all_concrete_types<span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> exemplar<span class="Delimiter">);</span>
 <span id="L516" class="LineNr"> 516 </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#L141'>SIZE</a><span class="Delimiter">(</span>new_recipe<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
@@ -591,12 +591,12 @@ if ('onhashchange' in window) {
 <span id="L526" class="LineNr"> 526 </span>
 <span id="L527" class="LineNr"> 527 </span><span class="Normal">void</span> ensure_all_concrete_types<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">const</span><span class="Comment">*/</span> reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; exemplar<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L528" class="LineNr"> 528 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type || contains_type_ingredient_name<span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L529" class="LineNr"> 529 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L529" class="LineNr"> 529 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L530" class="LineNr"> 530 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type<span class="Delimiter">)</span> x<span class="Delimiter">.</span>type = <span class="Normal">new</span> type_tree<span class="Delimiter">(</span><span class="Constant">&quot;added_by_ensure_all_concrete_types&quot;</span><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>  <span class="Comment">// just to prevent crashes later</span>
 <span id="L531" class="LineNr"> 531 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L532" class="LineNr"> 532 </span>  <span class="Delimiter">}</span>
 <span id="L533" class="LineNr"> 533 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value == -<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L534" class="LineNr"> 534 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to the unknown &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L534" class="LineNr"> 534 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>exemplar<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;failed to map a type to the unknown &quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L535" class="LineNr"> 535 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L536" class="LineNr"> 536 </span>  <span class="Delimiter">}</span>
 <span id="L537" class="LineNr"> 537 </span><span class="Delimiter">}</span>
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index a52592cb..7de41706 100644
--- a/html/057immutable.cc.html
+++ b/html/057immutable.cc.html
@@ -407,7 +407,7 @@ if ('onhashchange' in window) {
 <span id="L344" class="LineNr">344 </span>  <span class="Comment">//   b) we never call 'put' or 'put-index' on it, and</span>
 <span id="L345" class="LineNr">345 </span>  <span class="Comment">//   c) any non-primitive recipe calls in the body aren't returning it as a product</span>
 <span id="L346" class="LineNr">346 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check mutability of ingredients in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check mutability of ingredients in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L348" class="LineNr">348 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// skip check for old-style recipes calling next-ingredient directly</span>
 <span id="L349" class="LineNr">349 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L350" class="LineNr">350 </span>    <span class="Normal">const</span> reagent&amp; current_ingredient = caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
@@ -430,7 +430,7 @@ if ('onhashchange' in window) {
 <span id="L367" class="LineNr">367 </span>    <span class="Comment">// primitive recipe</span>
 <span id="L368" class="LineNr">368 </span>    <span class="Normal">switch</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L369" class="LineNr">369 </span>      <span class="Normal">case</span> <a href='010vm.cc.html#L196'>COPY</a>:
-<span id="L370" class="LineNr">370 </span>        <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = current_ingredient_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != current_ingredient_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L370" class="LineNr">370 </span>        <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = current_ingredient_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != current_ingredient_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
 <span id="L371" class="LineNr">371 </span>          current_ingredient_and_aliases<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>*p<span class="Delimiter">).</span>name<span class="Delimiter">);</span>
 <span id="L372" class="LineNr">372 </span>        <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L373" class="LineNr">373 </span>      <span class="Normal">case</span> GET:
@@ -448,7 +448,7 @@ if ('onhashchange' in window) {
 <span id="L385" class="LineNr">385 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L386" class="LineNr">386 </span>    <span class="Comment">// defined recipe</span>
 <span id="L387" class="LineNr">387 </span>    set&lt;<span class="Normal">int</span>&gt; contained_in_product_indices = <a href='057immutable.cc.html#L395'>scan_contained_in_product_indices</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> current_ingredient_indices<span class="Delimiter">);</span>
-<span id="L388" class="LineNr">388 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = contained_in_product_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != contained_in_product_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L388" class="LineNr">388 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = contained_in_product_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != contained_in_product_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L389" class="LineNr">389 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*p &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">))</span>
 <span id="L390" class="LineNr">390 </span>        current_ingredient_and_aliases<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>*p<span class="Delimiter">));</span>
 <span id="L391" class="LineNr">391 </span>    <span class="Delimiter">}</span>
@@ -458,7 +458,7 @@ if ('onhashchange' in window) {
 <span id="L395" class="LineNr">395 </span>set&lt;<span class="Normal">int</span>&gt; <a href='057immutable.cc.html#L395'>scan_contained_in_product_indices</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> set&lt;<span class="Normal">int</span>&gt;&amp; <a href='057immutable.cc.html#L544'>ingredient_indices</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L396" class="LineNr">396 </span>  set&lt;reagent<span class="Delimiter">,</span> name_and_space_lt&gt; selected_ingredients<span class="Delimiter">;</span>
 <span id="L397" class="LineNr">397 </span>  <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>operation<span class="Delimiter">);</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = <a href='057immutable.cc.html#L544'>ingredient_indices</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='057immutable.cc.html#L544'>ingredient_indices</a><span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = <a href='057immutable.cc.html#L544'>ingredient_indices</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='057immutable.cc.html#L544'>ingredient_indices</a><span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L399" class="LineNr">399 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*p &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// optional immutable ingredient</span>
 <span id="L400" class="LineNr">400 </span>    selected_ingredients<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>*p<span class="Delimiter">));</span>
 <span id="L401" class="LineNr">401 </span>  <span class="Delimiter">}</span>
@@ -466,7 +466,7 @@ if ('onhashchange' in window) {
 <span id="L403" class="LineNr">403 </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#L141'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L404" class="LineNr">404 </span>    <span class="Normal">const</span> reagent&amp; current_product = callee<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L405" class="LineNr">405 </span>    <span class="Normal">const</span> string_tree* contained_in_name = property<span class="Delimiter">(</span>current_product<span class="Delimiter">,</span> <span class="Constant">&quot;contained-in&quot;</span><span class="Delimiter">);</span>
-<span id="L406" class="LineNr">406 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contained_in_name &amp;&amp; selected_ingredients<span class="Delimiter">.</span>find<span class="Delimiter">(</span>contained_in_name<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> != selected_ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span>
+<span id="L406" class="LineNr">406 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contained_in_name &amp;&amp; selected_ingredients<span class="Delimiter">.</span>find<span class="Delimiter">(</span>contained_in_name<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> != selected_ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span>
 <span id="L407" class="LineNr">407 </span>      result<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L408" class="LineNr">408 </span>  <span class="Delimiter">}</span>
 <span id="L409" class="LineNr">409 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -542,19 +542,19 @@ if ('onhashchange' in window) {
 <span id="L479" class="LineNr">479 </span>  <span class="Comment">// first check if the instruction is directly modifying something it shouldn't</span>
 <span id="L480" class="LineNr">480 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L481" class="LineNr">481 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">)</span>
-<span id="L482" class="LineNr">482 </span>        &amp;&amp; current_ingredient_and_aliases<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != current_ingredient_and_aliases<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L482" class="LineNr">482 </span>        &amp;&amp; current_ingredient_and_aliases<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != current_ingredient_and_aliases<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L483" class="LineNr">483 </span>      string current_product_name = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
 <span id="L484" class="LineNr">484 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>current_product_name == original_ingredient_name<span class="Delimiter">)</span>
-<span id="L485" class="LineNr">485 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_product_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because it's an ingredient of recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L485" class="LineNr">485 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_product_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because it's an ingredient of recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L486" class="LineNr">486 </span>      <span class="Normal">else</span>
-<span id="L487" class="LineNr">487 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_product_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because that would modify &quot;</span> &lt;&lt; original_ingredient_name &lt;&lt; <span class="Constant">&quot; which is an ingredient of <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L487" class="LineNr">487 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_product_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because that would modify &quot;</span> &lt;&lt; original_ingredient_name &lt;&lt; <span class="Constant">&quot; which is an ingredient of <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L488" class="LineNr">488 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L489" class="LineNr">489 </span>    <span class="Delimiter">}</span>
 <span id="L490" class="LineNr">490 </span>  <span class="Delimiter">}</span>
 <span id="L491" class="LineNr">491 </span>  <span class="Comment">// check if there's any indirect modification going on</span>
 <span id="L492" class="LineNr">492 </span>  set&lt;<span class="Normal">int</span>&gt; current_ingredient_indices = <a href='057immutable.cc.html#L544'>ingredient_indices</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> current_ingredient_and_aliases<span class="Delimiter">);</span>
 <span id="L493" class="LineNr">493 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>current_ingredient_indices<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// ingredient not found in call</span>
-<span id="L494" class="LineNr">494 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = current_ingredient_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != current_ingredient_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L494" class="LineNr">494 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>set&lt;<span class="Normal">int</span>&gt;::iterator p = current_ingredient_indices<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != current_ingredient_indices<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L495" class="LineNr">495 </span>    <span class="Normal">const</span> <span class="Normal">int</span> current_ingredient_index = *p<span class="Delimiter">;</span>
 <span id="L496" class="LineNr">496 </span>    reagent current_ingredient = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>current_ingredient_index<span class="Delimiter">);</span>
 <span id="L497" class="LineNr">497 </span>    canonize_type<span class="Delimiter">(</span>current_ingredient<span class="Delimiter">);</span>
@@ -568,9 +568,9 @@ if ('onhashchange' in window) {
 <span id="L505" class="LineNr">505 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation == PUT || inst<span class="Delimiter">.</span>operation == PUT_INDEX<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L506" class="LineNr">506 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>current_ingredient_index == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L507" class="LineNr">507 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>current_ingredient_name == original_ingredient_name<span class="Delimiter">)</span>
-<span id="L508" class="LineNr">508 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because it's an ingredient of recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L508" class="LineNr">508 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because it's an ingredient of recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L509" class="LineNr">509 </span>          <span class="Normal">else</span>
-<span id="L510" class="LineNr">510 </span>            <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because that would modify '&quot;</span> &lt;&lt; original_ingredient_name &lt;&lt; <span class="Constant">&quot;' which is an ingredient of <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L510" class="LineNr">510 </span>            <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because that would modify '&quot;</span> &lt;&lt; original_ingredient_name &lt;&lt; <span class="Constant">&quot;' which is an ingredient of <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L511" class="LineNr">511 </span>        <span class="Delimiter">}</span>
 <span id="L512" class="LineNr">512 </span>      <span class="Delimiter">}</span>
 <span id="L513" class="LineNr">513 </span>    <span class="Delimiter">}</span>
@@ -578,9 +578,9 @@ if ('onhashchange' in window) {
 <span id="L515" class="LineNr">515 </span>      <span class="Comment">// defined recipe</span>
 <span id="L516" class="LineNr">516 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='057immutable.cc.html#L526'>is_modified_in_recipe</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">,</span> current_ingredient_index<span class="Delimiter">,</span> caller<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L517" class="LineNr">517 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>current_ingredient_name == original_ingredient_name<span class="Delimiter">)</span>
-<span id="L518" class="LineNr">518 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because it's an ingredient of recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L518" class="LineNr">518 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because it's an ingredient of recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L519" class="LineNr">519 </span>        <span class="Normal">else</span>
-<span id="L520" class="LineNr">520 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because that would modify '&quot;</span> &lt;&lt; original_ingredient_name &lt;&lt; <span class="Constant">&quot;' which is an ingredient of <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L520" class="LineNr">520 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;cannot modify '&quot;</span> &lt;&lt; current_ingredient_name &lt;&lt; <span class="Constant">&quot;' in <a href='010vm.cc.html#L33'>instruction</a> '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' because that would modify '&quot;</span> &lt;&lt; original_ingredient_name &lt;&lt; <span class="Constant">&quot;' which is an ingredient of <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; but not also a product</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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 class="Delimiter">}</span>
@@ -589,7 +589,7 @@ if ('onhashchange' in window) {
 <span id="L526" class="LineNr">526 </span><span class="Normal">bool</span> <a href='057immutable.cc.html#L526'>is_modified_in_recipe</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">int</span> ingredient_index<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L527" class="LineNr">527 </span>  <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L528" class="LineNr">528 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!callee<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L529" class="LineNr">529 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't check mutability of ingredients in recipe &quot;</span> &lt;&lt; callee<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; because it uses 'next-ingredient' directly, rather than a recipe header.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L529" class="LineNr">529 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;can't check mutability of ingredients in recipe &quot;</span> &lt;&lt; callee<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; because it uses 'next-ingredient' directly, rather than a recipe header.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L530" class="LineNr">530 </span>    <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L531" class="LineNr">531 </span>  <span class="Delimiter">}</span>
 <span id="L532" class="LineNr">532 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_index &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// optional immutable ingredient</span>
@@ -608,7 +608,7 @@ if ('onhashchange' in window) {
 <span id="L545" class="LineNr">545 </span>  set&lt;<span class="Normal">int</span>&gt; result<span class="Delimiter">;</span>
 <span id="L546" class="LineNr">546 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L547" class="LineNr">547 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L548" class="LineNr">548 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != ingredient_names<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span>
+<span id="L548" class="LineNr">548 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>ingredient_names<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != ingredient_names<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span>
 <span id="L549" class="LineNr">549 </span>      result<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L550" class="LineNr">550 </span>  <span class="Delimiter">}</span>
 <span id="L551" class="LineNr">551 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -660,7 +660,7 @@ if ('onhashchange' in window) {
 <span id="L597" class="LineNr">597 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!tmp<span class="Delimiter">-&gt;</span>atom
 <span id="L598" class="LineNr">598 </span>      || <span class="Delimiter">(</span>!is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> tmp<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span>
 <span id="L599" class="LineNr">599 </span>          &amp;&amp; !is_present_in_products<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> tmp<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L600" class="LineNr">600 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;/contained-in can only point to another ingredient or product, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>property<span class="Delimiter">(</span>current_ingredient<span class="Delimiter">,</span> <span class="Constant">&quot;contained-in&quot;</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L600" class="LineNr">600 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;/contained-in can only point to another ingredient or product, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>property<span class="Delimiter">(</span>current_ingredient<span class="Delimiter">,</span> <span class="Constant">&quot;contained-in&quot;</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L601" class="LineNr">601 </span>  <span class="Delimiter">}</span>
 <span id="L602" class="LineNr">602 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L603" class="LineNr">603 </span><span class="Delimiter">}</span>
diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html
index 710fefd5..87eac399 100644
--- a/html/058to_text.cc.html
+++ b/html/058to_text.cc.html
@@ -68,7 +68,7 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L10" class="LineNr">10 </span><span class="Normal">case</span> TO_TEXT: <span class="Delimiter">{</span>
 <span id="L11" class="LineNr">11 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L12" class="LineNr">12 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'to-text' requires a single ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L12" class="LineNr">12 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'to-text' requires a single ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L13" class="LineNr">13 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L14" class="LineNr">14 </span>  <span class="Delimiter">}</span>
 <span id="L15" class="LineNr">15 </span>  <span class="Comment">// can handle any type</span>
diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html
index 094f758c..13e41d74 100644
--- a/html/060rewrite_literal_string.cc.html
+++ b/html/060rewrite_literal_string.cc.html
@@ -99,12 +99,12 @@ if ('onhashchange' in window) {
 <span id="L38" class="LineNr">38 </span>
 <span id="L39" class="LineNr">39 </span><span class="Normal">void</span> <a href='060rewrite_literal_string.cc.html#L39'>rewrite_literal_string_to_text</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr">40 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L41" class="LineNr">41 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- rewrite literal strings in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L41" class="LineNr">41 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- rewrite literal strings in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L42" class="LineNr">42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='060rewrite_literal_string.cc.html#L65'>contains_numeric_locations</a><span class="Delimiter">(</span>caller<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L43" class="LineNr">43 </span>  vector&lt;instruction&gt; new_instructions<span class="Delimiter">;</span>
 <span id="L44" class="LineNr">44 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L45" class="LineNr">45 </span>    instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L46" class="LineNr">46 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>recipes_taking_literal_strings<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> == recipes_taking_literal_strings<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L46" class="LineNr">46 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>recipes_taking_literal_strings<span class="Delimiter">.</span>find<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> == recipes_taking_literal_strings<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L47" class="LineNr">47 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L48" class="LineNr">48 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L49" class="LineNr">49 </span>        <a href='010vm.cc.html#L33'>instruction</a> def<span class="Delimiter">;</span>
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index 7be88099..81c5bf70 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -76,10 +76,10 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr"> 14 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L15" class="LineNr"> 15 </span>  local-scope
 <span id="L16" class="LineNr"> 16 </span>  <span class="Normal">n</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
-<span id="L17" class="LineNr"> 17 </span>  <a href='003trace.cc.html#L190'>trace</a> <span class="Constant">2</span><span class="Delimiter">,</span> [app]<span class="Delimiter">,</span> n
+<span id="L17" class="LineNr"> 17 </span>  <a href='003trace.cc.html#L189'>trace</a> <span class="Constant">2</span><span class="Delimiter">,</span> [app]<span class="Delimiter">,</span> n
 <span id="L18" class="LineNr"> 18 </span>]
 <span id="L19" class="LineNr"> 19 </span><span class="traceContains">+transform: {trace_2_2: (&quot;address&quot; &quot;array&quot; &quot;character&quot;)} &lt;- to-text-line {n: &quot;number&quot;}</span>
-<span id="L20" class="LineNr"> 20 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L190'>trace</a> {2: &quot;literal&quot;}, {&quot;app&quot;: &quot;literal-string&quot;}, {trace_2_2: (&quot;address&quot; &quot;array&quot; &quot;character&quot;)}</span>
+<span id="L20" class="LineNr"> 20 </span><span class="traceContains">+transform: <a href='003trace.cc.html#L189'>trace</a> {2: &quot;literal&quot;}, {&quot;app&quot;: &quot;literal-string&quot;}, {trace_2_2: (&quot;address&quot; &quot;array&quot; &quot;character&quot;)}</span>
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span><span class="Comment">//: special case: rewrite attempts to stash contents of most arrays to avoid</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Comment">//: passing addresses around</span>
@@ -121,7 +121,7 @@ if ('onhashchange' in window) {
 <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(code)</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> convert_ingredients_to_text<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L61" class="LineNr"> 61 </span>  recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- convert some ingredients to text in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- convert some ingredients to text in <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// in recipes without named locations, 'stash' is still not extensible</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='060rewrite_literal_string.cc.html#L65'>contains_numeric_locations</a><span class="Delimiter">(</span>caller<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L65" class="LineNr"> 65 </span>  convert_ingredients_to_text<span class="Delimiter">(</span>caller<span class="Delimiter">);</span>
@@ -162,7 +162,7 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>        <span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>      <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>    <span class="Delimiter">}</span>
-<span id="L103" class="LineNr">103 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L104" class="LineNr">104 </span>    new_instructions<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
 <span id="L106" class="LineNr">106 </span>  caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_instructions<span class="Delimiter">);</span>
@@ -187,7 +187,7 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span>    def<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>r<span class="Delimiter">);</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>  def<span class="Delimiter">.</span>products<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>reagent<span class="Delimiter">(</span>tmp_var<span class="Delimiter">));</span>
-<span id="L128" class="LineNr">128 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>def<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9993</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>def<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>  out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>def<span class="Delimiter">);</span>
 <span id="L130" class="LineNr">130 </span>  r<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>  <span class="Comment">// reclaim old memory</span>
 <span id="L131" class="LineNr">131 </span>  r = reagent<span class="Delimiter">(</span>tmp_var<span class="Delimiter">);</span>
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 0ea3fa15..1d90a537 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -79,7 +79,7 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L16" class="LineNr"> 16 </span><span class="Normal">case</span> HASH: <span class="Delimiter">{</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L18" class="LineNr"> 18 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'hash' takes exactly one ingredient rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L18" class="LineNr"> 18 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'hash' takes exactly one ingredient rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L19" class="LineNr"> 19 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Delimiter">}</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -119,7 +119,7 @@ if ('onhashchange' in window) {
 <span id="L55" class="LineNr"> 55 </span>
 <span id="L56" class="LineNr"> 56 </span><span class="Normal">size_t</span> <a href='069hash.cc.html#L56'>hash_mu_address</a><span class="Delimiter">(</span><span class="Normal">size_t</span> h<span class="Delimiter">,</span> reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; r<span class="Delimiter">.</span>value &lt;&lt; <span class="Constant">&quot; is &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </span>  r<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> r<span class="Delimiter">.</span>value<span class="Delimiter">));</span>
 <span id="L60" class="LineNr"> 60 </span>  drop_from_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Identifier">return</span> <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L106" class="LineNr">106 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> variant = variant_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> tag<span class="Delimiter">);</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Comment">// todo: move this error to container definition time</span>
 <span id="L108" class="LineNr">108 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>variant<span class="Delimiter">,</span> <span class="Constant">&quot;ignore-for-hash&quot;</span><span class="Delimiter">))</span>
-<span id="L109" class="LineNr">109 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;: /ignore-for-hash won't work in exclusive containers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;: /ignore-for-hash won't work in exclusive containers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L110" class="LineNr">110 </span>  variant<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>value + <span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L111" class="LineNr">111 </span>  h = <a href='069hash.cc.html#L34'>hash</a><span class="Delimiter">(</span>h<span class="Delimiter">,</span> variant<span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Identifier">return</span> h<span class="Delimiter">;</span>
@@ -396,11 +396,11 @@ if ('onhashchange' in window) {
 <span id="L332" class="LineNr">332 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L333" class="LineNr">333 </span><span class="Normal">case</span> HASH_OLD: <span class="Delimiter">{</span>
 <span id="L334" class="LineNr">334 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'hash_old' takes exactly one ingredient rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L335" class="LineNr">335 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'hash_old' takes exactly one ingredient rather than '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L336" class="LineNr">336 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L339" class="LineNr">339 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'hash_old' currently only supports texts (address array character), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L339" class="LineNr">339 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'hash_old' currently only supports texts (address array character), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 70743be3..0ad12422 100644
--- a/html/072recipe.cc.html
+++ b/html/072recipe.cc.html
@@ -130,11 +130,11 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L68" class="LineNr"> 68 </span><span class="Normal">case</span> CALL: <span class="Delimiter">{</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'call' requires at least one ingredient (the <a href='010vm.cc.html#L19'>recipe</a> to call)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'call' requires at least one ingredient (the <a href='010vm.cc.html#L19'>recipe</a> to call)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Delimiter">}</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_recipe<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'call' should be a <a href='010vm.cc.html#L19'>recipe</a>, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'call' should be a <a href='010vm.cc.html#L19'>recipe</a>, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Delimiter">}</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -144,11 +144,11 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </span>  <span class="Comment">// Begin Call</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L83" class="LineNr"> 83 </span>    ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;indirect 'call': incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;indirect 'call': incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L85" class="LineNr"> 85 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">}</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to call empty <a href='010vm.cc.html#L19'>recipe</a> in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to call empty <a href='010vm.cc.html#L19'>recipe</a> in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">const</span> call&amp; caller_frame = <a href='026call.cc.html#L83'>current_call</a><span class="Delimiter">();</span>
@@ -287,7 +287,7 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='072recipe.cc.html#L226'>check_indirect_calls_against_header</a><span class="Delimiter">);</span>  <span class="Comment">// idempotent</span>
 <span id="L225" class="LineNr">225 </span><span class="Delimiter">:(code)</span>
 <span id="L226" class="LineNr">226 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L226'>check_indirect_calls_against_header</a><span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L227" class="LineNr">227 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check 'call' instructions inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L227" class="LineNr">227 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- type-check 'call' instructions inside <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L229" class="LineNr">229 </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#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L230" class="LineNr">230 </span>    <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
@@ -300,14 +300,14 @@ if ('onhashchange' in window) {
 <span id="L237" class="LineNr">237 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L257'>is_indirect_call_with_ingredients</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<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">long</span> <span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span>+<span class="Comment">/*</span><span class="Comment">skip callee</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="L239" class="LineNr">239 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">),</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L240" class="LineNr">240 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L240" class="LineNr">240 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ingredient &quot;</span> &lt;&lt; i-<span class="Comment">/*</span><span class="Comment">skip callee</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L241" class="LineNr">241 </span>      <span class="Delimiter">}</span>
 <span id="L242" class="LineNr">242 </span>    <span class="Delimiter">}</span>
 <span id="L243" class="LineNr">243 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L262'>is_indirect_call_with_products</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L244" class="LineNr">244 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>products<span class="Delimiter">));</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L245" class="LineNr">245 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>is_dummy<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L246" class="LineNr">246 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!types_coercible<span class="Delimiter">(</span>callee_header<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L247" class="LineNr">247 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L247" class="LineNr">247 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; has the wrong type at '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L248" class="LineNr">248 </span>      <span class="Delimiter">}</span>
 <span id="L249" class="LineNr">249 </span>    <span class="Delimiter">}</span>
 <span id="L250" class="LineNr">250 </span>  <span class="Delimiter">}</span>
@@ -433,7 +433,7 @@ if ('onhashchange' in window) {
 <span id="L370" class="LineNr">370 </span><span class="Delimiter">:(before &quot;End Matching Types For Literal(to)&quot;)</span>
 <span id="L371" class="LineNr">371 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='072recipe.cc.html#L335'>is_mu_recipe</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L372" class="LineNr">372 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L373" class="LineNr">373 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;trying to store <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; from<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; into &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>to<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but there's no such recipe</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L373" class="LineNr">373 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;trying to store <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; from<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; into &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>to<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; but there's no such recipe</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L374" class="LineNr">374 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L375" class="LineNr">375 </span>  <span class="Delimiter">}</span>
 <span id="L376" class="LineNr">376 </span>  <span class="Normal">const</span> recipe&amp; rrhs = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
@@ -485,9 +485,9 @@ if ('onhashchange' in window) {
 <span id="L422" class="LineNr">422 </span><span class="Normal">void</span> <a href='072recipe.cc.html#L422'>check_for_recipe_literals</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L423" class="LineNr">423 </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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span>  ++i<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='072recipe.cc.html#L335'>is_mu_recipe</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L425" class="LineNr">425 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L425" class="LineNr">425 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;missing type for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;' in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L426" class="LineNr">426 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span>
-<span id="L427" class="LineNr">427 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L427" class="LineNr">427 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L428" class="LineNr">428 </span>    <span class="Delimiter">}</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Delimiter">}</span>
 <span id="L430" class="LineNr">430 </span><span class="Delimiter">}</span>
@@ -620,12 +620,12 @@ if ('onhashchange' in window) {
 <span id="L557" class="LineNr">557 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L326'>non_ghost_size</a><span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span> &lt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L558" class="LineNr">558 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt; <a href='010vm.cc.html#L198'>MAX_PRIMITIVE_RECIPES</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L559" class="LineNr">559 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L326'>non_ghost_size</a><span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">))</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L560" class="LineNr">560 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;sorry, we're not yet smart enough to simultaneously guess which overloads you want for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L560" class="LineNr">560 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;sorry, we're not yet smart enough to simultaneously guess which overloads you want for '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' and '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L561" class="LineNr">561 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L562" class="LineNr">562 </span>  <span class="Delimiter">}</span>
 <span id="L563" class="LineNr">563 </span>  <span class="Normal">const</span> recipe&amp; callee = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">));</span>
 <span id="L564" class="LineNr">564 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!callee<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L565" class="LineNr">565 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;sorry, we're not yet smart enough to guess which variant of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' you want, when the caller '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' doesn't have a header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L565" class="LineNr">565 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;sorry, we're not yet smart enough to guess which variant of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' you want, when the caller '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' doesn't have a header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L566" class="LineNr">566 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L567" class="LineNr">567 </span>  <span class="Delimiter">}</span>
 <span id="L568" class="LineNr">568 </span>  string new_name = <a href='054static_dispatch.cc.html#L173'>resolve_ambiguous_call</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">,</span> callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> r<span class="Delimiter">,</span> index<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
@@ -667,7 +667,7 @@ if ('onhashchange' in window) {
 <span id="L604" class="LineNr">604 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='054static_dispatch.cc.html#L326'>non_ghost_size</a><span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Recipe_variants<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span> &lt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L605" class="LineNr">605 </span>    <span class="Comment">// potentially overloaded recipe</span>
 <span id="L606" class="LineNr">606 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!caller_recipe<span class="Delimiter">.</span>has_header<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L607" class="LineNr">607 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;sorry, we're not yet smart enough to guess which variant of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' you want, without a recipe header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L607" class="LineNr">607 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller_recipe<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;sorry, we're not yet smart enough to guess which variant of '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' you want, without a recipe header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L608" class="LineNr">608 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L609" class="LineNr">609 </span>    <span class="Delimiter">}</span>
 <span id="L610" class="LineNr">610 </span>    string new_name = <a href='054static_dispatch.cc.html#L173'>resolve_ambiguous_call</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> r<span class="Delimiter">,</span> index<span class="Delimiter">,</span> caller_recipe<span class="Delimiter">);</span>
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index 6812df55..a7505f6a 100644
--- a/html/073scheduler.cc.html
+++ b/html/073scheduler.cc.html
@@ -133,7 +133,7 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </span>    <a href='073scheduler.cc.html#L94'>skip_to_next_routine</a><span class="Delimiter">();</span>
 <span id="L70" class="LineNr"> 70 </span>    assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">);</span>
 <span id="L71" class="LineNr"> 71 </span>    assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>state == <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">);</span>
-<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='073scheduler.cc.html#L106'>current_routine_label</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9990</span><span class="Delimiter">,</span> <span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='073scheduler.cc.html#L106'>current_routine_label</a><span class="Delimiter">()</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L73" class="LineNr"> 73 </span>    run_current_routine<span class="Delimiter">();</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="Comment">// Scheduler State Transitions</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>completed<span class="Delimiter">())</span>
@@ -174,7 +174,7 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span>string <a href='073scheduler.cc.html#L110'>routine_label</a><span class="Delimiter">(</span>routine* r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L111" class="LineNr">111 </span>  ostringstream result<span class="Delimiter">;</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">const</span> call_stack&amp; calls = r<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != calls<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_iterator p = calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != calls<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L114" class="LineNr">114 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p != calls<span class="Delimiter">.</span>begin<span class="Delimiter">())</span> result &lt;&lt; <span class="Constant">'/'</span><span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </span>    result &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name<span class="Delimiter">;</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Delimiter">}</span>
@@ -227,11 +227,11 @@ if ('onhashchange' in window) {
 <span id="L163" class="LineNr">163 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L164" class="LineNr">164 </span><span class="Normal">case</span> START_RUNNING: <span class="Delimiter">{</span>
 <span id="L165" class="LineNr">165 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'start-running' requires at least one ingredient: the <a href='010vm.cc.html#L19'>recipe</a> to start running</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L166" class="LineNr">166 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'start-running' requires at least one ingredient: the <a href='010vm.cc.html#L19'>recipe</a> to start running</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_recipe<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'start-running' should be a <a href='010vm.cc.html#L19'>recipe</a>, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'start-running' should be a <a href='010vm.cc.html#L19'>recipe</a>, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>    <span class="Identifier">break</span><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>
@@ -375,7 +375,7 @@ if ('onhashchange' in window) {
 <span id="L311" class="LineNr">311 </span><span class="traceContains">+error: f2: divide by zero in '3:num &lt;- divide-with-remainder 4, 0'</span>
 <span id="L312" class="LineNr">312 </span><span class="traceAbsent">-error: f2: divide by zero in '4:num &lt;- divide-with-remainder 4, 0'</span>
 <span id="L313" class="LineNr">313 </span>
-<span id="L314" class="LineNr">314 </span><span class="Delimiter">:(after &quot;operator&lt;&lt;(ostream&amp; os, <a href='003trace.cc.html#L226'>end</a> /*unused*/)&quot;)</span>
+<span id="L314" class="LineNr">314 </span><span class="Delimiter">:(after &quot;operator&lt;&lt;(ostream&amp; os, <a href='003trace.cc.html#L225'>end</a> /*unused*/)&quot;)</span>
 <span id="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream &amp;&amp; Trace_stream<span class="Delimiter">-&gt;</span>curr_label == <span class="Constant">&quot;error&quot;</span> &amp;&amp; Current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L316" class="LineNr">316 </span>    Current_routine<span class="Delimiter">-&gt;</span>state = <a href='073scheduler.cc.html#L42'>COMPLETED</a><span class="Delimiter">;</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
@@ -435,11 +435,11 @@ if ('onhashchange' in window) {
 <span id="L371" class="LineNr">371 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L372" class="LineNr">372 </span><span class="Normal">case</span> ROUTINE_STATE: <span class="Delimiter">{</span>
 <span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L374" class="LineNr">374 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'routine-state' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L374" class="LineNr">374 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'routine-state' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L375" class="LineNr">375 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L376" class="LineNr">376 </span>  <span class="Delimiter">}</span>
 <span id="L377" class="LineNr">377 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L378" class="LineNr">378 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'routine-state' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L378" class="LineNr">378 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'routine-state' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L379" class="LineNr">379 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L380" class="LineNr">380 </span>  <span class="Delimiter">}</span>
 <span id="L381" class="LineNr">381 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -468,11 +468,11 @@ if ('onhashchange' in window) {
 <span id="L404" class="LineNr">404 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L405" class="LineNr">405 </span><span class="Normal">case</span> STOP: <span class="Delimiter">{</span>
 <span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L407" class="LineNr">407 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'stop' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L407" class="LineNr">407 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'stop' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L408" class="LineNr">408 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L409" class="LineNr">409 </span>  <span class="Delimiter">}</span>
 <span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L411" class="LineNr">411 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'stop' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L411" class="LineNr">411 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'stop' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L412" class="LineNr">412 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L413" class="LineNr">413 </span>  <span class="Delimiter">}</span>
 <span id="L414" class="LineNr">414 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -529,7 +529,7 @@ if ('onhashchange' in window) {
 <span id="L465" class="LineNr">465 </span><span class="Delimiter">:(before &quot;End Scheduler State Transitions&quot;)</span>
 <span id="L466" class="LineNr">466 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>limit &gt;= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L467" class="LineNr">467 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>limit &lt;= Scheduling_interval<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L468" class="LineNr">468 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;discontinuing routine &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;discontinuing routine &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L469" class="LineNr">469 </span>    Current_routine<span class="Delimiter">-&gt;</span>state = DISCONTINUED<span class="Delimiter">;</span>
 <span id="L470" class="LineNr">470 </span>    Current_routine<span class="Delimiter">-&gt;</span>limit = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L471" class="LineNr">471 </span>  <span class="Delimiter">}</span>
@@ -540,10 +540,10 @@ if ('onhashchange' in window) {
 <span id="L476" class="LineNr">476 </span>
 <span id="L477" class="LineNr">477 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
 <span id="L478" class="LineNr">478 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; any_routines_with_error<span class="Delimiter">())</span>
-<span id="L479" class="LineNr">479 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;some routines died with errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L479" class="LineNr">479 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;some routines died with errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L480" class="LineNr">480 </span><span class="Delimiter">:(before &quot;End Mu Test Teardown&quot;)</span>
 <span id="L481" class="LineNr">481 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; any_routines_with_error<span class="Delimiter">())</span>
-<span id="L482" class="LineNr">482 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; Current_scenario<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;: some routines died with errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L482" class="LineNr">482 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; Current_scenario<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;: some routines died with errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L483" class="LineNr">483 </span>
 <span id="L484" class="LineNr">484 </span><span class="Delimiter">:(code)</span>
 <span id="L485" class="LineNr">485 </span><span class="Normal">bool</span> any_routines_with_error<span class="Delimiter">()</span> <span class="Delimiter">{</span>
@@ -566,15 +566,15 @@ if ('onhashchange' in window) {
 <span id="L502" class="LineNr">502 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L503" class="LineNr">503 </span><span class="Normal">case</span> LIMIT_TIME: <span class="Delimiter">{</span>
 <span id="L504" class="LineNr">504 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L505" class="LineNr">505 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'limit-time' requires exactly two ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L505" class="LineNr">505 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'limit-time' requires exactly two ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L506" class="LineNr">506 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L507" class="LineNr">507 </span>  <span class="Delimiter">}</span>
 <span id="L508" class="LineNr">508 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L509" class="LineNr">509 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'limit-time' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L509" class="LineNr">509 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'limit-time' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L510" class="LineNr">510 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L511" class="LineNr">511 </span>  <span class="Delimiter">}</span>
 <span id="L512" class="LineNr">512 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L513" class="LineNr">513 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'limit-time' should be a number (of instructions to run for), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L513" class="LineNr">513 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'limit-time' should be a number (of instructions to run for), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -604,11 +604,11 @@ if ('onhashchange' in window) {
 <span id="L540" class="LineNr">540 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L541" class="LineNr">541 </span><span class="Normal">case</span> NUMBER_OF_INSTRUCTIONS: <span class="Delimiter">{</span>
 <span id="L542" class="LineNr">542 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L543" class="LineNr">543 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'number-of-instructions' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L543" class="LineNr">543 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'number-of-instructions' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L544" class="LineNr">544 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L545" class="LineNr">545 </span>  <span class="Delimiter">}</span>
 <span id="L546" class="LineNr">546 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L547" class="LineNr">547 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'number-of-instructions' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L547" class="LineNr">547 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'number-of-instructions' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L548" class="LineNr">548 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L549" class="LineNr">549 </span>  <span class="Delimiter">}</span>
 <span id="L550" class="LineNr">550 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index 7e8d3583..caf08263 100644
--- a/html/074wait.cc.html
+++ b/html/074wait.cc.html
@@ -98,15 +98,15 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span>
 <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before &quot;End Mu Test Teardown&quot;)</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; <a href='074wait.cc.html#L47'>any_routines_waiting</a><span class="Delimiter">())</span>
-<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; Current_scenario<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;: deadlock!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; Current_scenario<span class="Delimiter">-&gt;</span>name &lt;&lt; <span class="Constant">&quot;: deadlock!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End Run Routine&quot;)</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='074wait.cc.html#L47'>any_routines_waiting</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;deadlock!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;deadlock!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>  <a href='074wait.cc.html#L54'>dump_waiting_routines</a><span class="Delimiter">();</span>
 <span id="L42" class="LineNr"> 42 </span><span class="Delimiter">}</span>
 <span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; any_routines_with_error<span class="Delimiter">())</span>
-<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;some routines died with errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>  <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;some routines died with errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(code)</span>
 <span id="L47" class="LineNr"> 47 </span><span class="Normal">bool</span> <a href='074wait.cc.html#L47'>any_routines_waiting</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L48" class="LineNr"> 48 </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#L141'>SIZE</a><span class="Delimiter">(</span>Routines<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -142,24 +142,24 @@ if ('onhashchange' in window) {
 <span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L79" class="LineNr"> 79 </span><span class="Normal">case</span> WAIT_FOR_RESET_THEN_SET: <span class="Delimiter">{</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-reset-then-set' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-reset-then-set' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">}</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_location<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-reset-then-set' requires a location ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-reset-then-set' requires a location ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Delimiter">}</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Identifier">break</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="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> WAIT_FOR_RESET_THEN_SET: <span class="Delimiter">{</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">int</span> loc = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;wait: *&quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; = &quot;</span> &lt;&lt; <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;wait: *&quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; = &quot;</span> &lt;&lt; <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; is already 0; setting&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; is already 0; setting&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L95" class="LineNr"> 95 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">,</span> <span class="Constant">1</span><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>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waiting for location &quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; to reset&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waiting for location &quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; to reset&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </span>  Current_routine<span class="Delimiter">-&gt;</span>state = WAITING<span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span>  Current_routine<span class="Delimiter">-&gt;</span>waiting_on_location = loc<span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -173,11 +173,11 @@ if ('onhashchange' in window) {
 <span id="L109" class="LineNr">109 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L110" class="LineNr">110 </span><span class="Normal">case</span> RESET: <span class="Delimiter">{</span>
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L112" class="LineNr">112 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'reset' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L112" class="LineNr">112 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'reset' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L113" class="LineNr">113 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L114" class="LineNr">114 </span>  <span class="Delimiter">}</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_location<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'reset' requires a location ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L116" class="LineNr">116 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'reset' requires a location ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Delimiter">}</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">}</span>
@@ -185,7 +185,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span><span class="Normal">case</span> RESET: <span class="Delimiter">{</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Normal">int</span> loc = <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;reset: *&quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; = &quot;</span> &lt;&lt; <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;reset: *&quot;</span> &lt;&lt; loc &lt;&lt; <span class="Constant">&quot; = &quot;</span> &lt;&lt; <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>
@@ -196,7 +196,7 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>state != WAITING<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L133" class="LineNr">133 </span>  <span class="Normal">int</span> loc = Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>waiting_on_location<span class="Delimiter">;</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>loc &amp;&amp; <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> loc<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L137" class="LineNr">137 </span>    Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>state = <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span>    Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)-&gt;</span>waiting_on_location = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -222,24 +222,24 @@ if ('onhashchange' in window) {
 <span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L159" class="LineNr">159 </span><span class="Normal">case</span> GET_LOCATION: <span class="Delimiter">{</span>
 <span id="L160" class="LineNr">160 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L161" class="LineNr">161 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get-location' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L161" class="LineNr">161 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get-location' expects exactly 2 ingredients in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> base = inst<span class="Delimiter">.</span>ingredients<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="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>base<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get-location' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L167" class="LineNr">167 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get-location' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L168" class="LineNr">168 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Delimiter">}</span>
 <span id="L170" class="LineNr">170 </span>  <span class="Normal">const</span> type_tree* base_root_type = base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom ? base<span class="Delimiter">.</span>type : base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">;</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!base_root_type<span class="Delimiter">-&gt;</span>atom || base_root_type<span class="Delimiter">-&gt;</span>value == <span class="Constant">0</span> || !contains_key<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">)</span> || get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_root_type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">).</span>kind != <a href='010vm.cc.html#L180'>CONTAINER</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get-location' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L172" class="LineNr">172 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'get-location' should be a container, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  <a href='010vm.cc.html#L125'>type_ordinal</a> base_type = base<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>value<span class="Delimiter">;</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Normal">const</span> reagent&amp; offset = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> || !is_mu_scalar<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L178" class="LineNr">178 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'get-location' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L178" class="LineNr">178 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'get-location' should have type 'offset', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L179" class="LineNr">179 </span>    <span class="Identifier">break</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="Normal">int</span> offset_value = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -247,7 +247,7 @@ if ('onhashchange' in window) {
 <span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>offset<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L184" class="LineNr">184 </span>    offset_value = to_integer<span class="Delimiter">(</span>offset<span class="Delimiter">.</span>name<span class="Delimiter">);</span>
 <span id="L185" class="LineNr">185 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>offset_value &lt; <span class="Constant">0</span> || offset_value &gt;= <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>elements<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid offset &quot;</span> &lt;&lt; offset_value &lt;&lt; <span class="Constant">&quot; for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;invalid offset &quot;</span> &lt;&lt; offset_value &lt;&lt; <span class="Constant">&quot; for '&quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Type<span class="Delimiter">,</span> base_type<span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L187" class="LineNr">187 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L188" class="LineNr">188 </span>    <span class="Delimiter">}</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
@@ -256,7 +256,7 @@ if ('onhashchange' in window) {
 <span id="L192" class="LineNr">192 </span>  <span class="Delimiter">}</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_location<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L195" class="LineNr">195 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get-location &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to type location but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L195" class="LineNr">195 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'get-location &quot;</span> &lt;&lt; base<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; offset<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' should write to type location but '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">&quot;' has type '&quot;</span> &lt;&lt; names_to_string_without_quotes<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L196" class="LineNr">196 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -267,7 +267,7 @@ if ('onhashchange' in window) {
 <span id="L203" class="LineNr">203 </span>  <a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Normal">int</span> base_address = base<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base_address == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L206" class="LineNr">206 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to access location 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L207" class="LineNr">207 </span>    <span class="Identifier">break</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">const</span> type_tree* base_type = get_base_type<span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">);</span>
@@ -276,7 +276,7 @@ if ('onhashchange' in window) {
 <span id="L212" class="LineNr">212 </span>  <span class="Normal">int</span> result = base_address<span class="Delimiter">;</span>
 <span id="L213" class="LineNr">213 </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; offset<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
 <span id="L214" class="LineNr">214 </span>    result += size_of<span class="Delimiter">(</span><a href='030container.cc.html#L212'>element_type</a><span class="Delimiter">(</span>base<span class="Delimiter">.</span>type<span class="Delimiter">,</span> i<span class="Delimiter">));</span>
-<span id="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;address to copy is &quot;</span> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L216" class="LineNr">216 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L217" class="LineNr">217 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
 <span id="L218" class="LineNr">218 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -385,11 +385,11 @@ if ('onhashchange' in window) {
 <span id="L321" class="LineNr">321 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L322" class="LineNr">322 </span><span class="Normal">case</span> WAIT_FOR_ROUTINE: <span class="Delimiter">{</span>
 <span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L324" class="LineNr">324 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-routine' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L324" class="LineNr">324 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-routine' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L325" class="LineNr">325 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L326" class="LineNr">326 </span>  <span class="Delimiter">}</span>
 <span id="L327" class="LineNr">327 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L328" class="LineNr">328 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'wait-for-routine' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L328" class="LineNr">328 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'wait-for-routine' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L329" class="LineNr">329 </span>    <span class="Identifier">break</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>
@@ -397,12 +397,12 @@ if ('onhashchange' in window) {
 <span id="L333" class="LineNr">333 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L334" class="LineNr">334 </span><span class="Normal">case</span> WAIT_FOR_ROUTINE: <span class="Delimiter">{</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == Current_routine<span class="Delimiter">-&gt;</span>id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &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>  Current_routine<span class="Delimiter">-&gt;</span>state = WAITING<span class="Delimiter">;</span>
 <span id="L340" class="LineNr">340 </span>  Current_routine<span class="Delimiter">-&gt;</span>waiting_on_routine = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waiting for routine &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waiting for routine &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L342" class="LineNr">342 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L343" class="LineNr">343 </span><span class="Delimiter">}</span>
 <span id="L344" class="LineNr">344 </span>
@@ -420,7 +420,7 @@ if ('onhashchange' in window) {
 <span id="L356" class="LineNr">356 </span>    <span class="Normal">const</span> routine* waitee = Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L357" class="LineNr">357 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>waitee<span class="Delimiter">-&gt;</span>id == id &amp;&amp; waitee<span class="Delimiter">-&gt;</span>state != <a href='073scheduler.cc.html#L41'>RUNNING</a> &amp;&amp; waitee<span class="Delimiter">-&gt;</span>state != WAITING<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L358" class="LineNr">358 </span>      <span class="Comment">// routine is COMPLETED or DISCONTINUED</span>
-<span id="L359" class="LineNr">359 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L359" class="LineNr">359 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L360" class="LineNr">360 </span>      waiter<span class="Delimiter">-&gt;</span>state = <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">;</span>
 <span id="L361" class="LineNr">361 </span>      waiter<span class="Delimiter">-&gt;</span>waiting_on_routine = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L362" class="LineNr">362 </span>    <span class="Delimiter">}</span>
@@ -484,7 +484,7 @@ if ('onhashchange' in window) {
 <span id="L420" class="LineNr">420 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L421" class="LineNr">421 </span><span class="Normal">case</span> CURRENT_ROUTINE_IS_BLOCKED: <span class="Delimiter">{</span>
 <span id="L422" class="LineNr">422 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L423" class="LineNr">423 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'current-routine-is-blocked' should have no ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L423" class="LineNr">423 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'current-routine-is-blocked' should have no ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L424" class="LineNr">424 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L425" class="LineNr">425 </span>  <span class="Delimiter">}</span>
 <span id="L426" class="LineNr">426 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -502,7 +502,7 @@ if ('onhashchange' in window) {
 <span id="L438" class="LineNr">438 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L439" class="LineNr">439 </span><span class="Normal">case</span> CURRENT_ROUTINE_IS_UNBLOCKED: <span class="Delimiter">{</span>
 <span id="L440" class="LineNr">440 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L441" class="LineNr">441 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'current-routine-is-unblocked' should have no ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'current-routine-is-unblocked' should have no ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L442" class="LineNr">442 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L443" class="LineNr">443 </span>  <span class="Delimiter">}</span>
 <span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -547,11 +547,11 @@ if ('onhashchange' in window) {
 <span id="L483" class="LineNr">483 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L484" class="LineNr">484 </span><span class="Normal">case</span> WAIT_FOR_ROUTINE_TO_BLOCK: <span class="Delimiter">{</span>
 <span id="L485" class="LineNr">485 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L486" class="LineNr">486 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-routine-to-block' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L486" class="LineNr">486 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'wait-for-routine-to-block' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L487" class="LineNr">487 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L488" class="LineNr">488 </span>  <span class="Delimiter">}</span>
 <span id="L489" class="LineNr">489 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L490" class="LineNr">490 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'wait-for-routine-to-block' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L490" class="LineNr">490 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'wait-for-routine-to-block' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L491" class="LineNr">491 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L492" class="LineNr">492 </span>  <span class="Delimiter">}</span>
 <span id="L493" class="LineNr">493 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -559,12 +559,12 @@ if ('onhashchange' in window) {
 <span id="L495" class="LineNr">495 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L496" class="LineNr">496 </span><span class="Normal">case</span> WAIT_FOR_ROUTINE_TO_BLOCK: <span class="Delimiter">{</span>
 <span id="L497" class="LineNr">497 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == Current_routine<span class="Delimiter">-&gt;</span>id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L498" class="LineNr">498 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L498" class="LineNr">498 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;routine can't wait for itself! '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &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>  Current_routine<span class="Delimiter">-&gt;</span>state = WAITING<span class="Delimiter">;</span>
 <span id="L502" class="LineNr">502 </span>  Current_routine<span class="Delimiter">-&gt;</span>waiting_on_routine_to_block = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L503" class="LineNr">503 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waiting for routine &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to block&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L503" class="LineNr">503 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9998</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waiting for routine &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to block&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L504" class="LineNr">504 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L505" class="LineNr">505 </span><span class="Delimiter">}</span>
 <span id="L506" class="LineNr">506 </span>
@@ -580,7 +580,7 @@ if ('onhashchange' in window) {
 <span id="L516" class="LineNr">516 </span>    <span class="Normal">const</span> routine* waitee = Routines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L517" class="LineNr">517 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>waitee<span class="Delimiter">-&gt;</span>id != id<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L518" class="LineNr">518 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>waitee<span class="Delimiter">-&gt;</span>state != <a href='073scheduler.cc.html#L41'>RUNNING</a> || waitee<span class="Delimiter">-&gt;</span>blocked<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L519" class="LineNr">519 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; because routine &quot;</span> &lt;&lt; waitee<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; is blocked&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L519" class="LineNr">519 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;schedule&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;waking up routine &quot;</span> &lt;&lt; waiter<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; because routine &quot;</span> &lt;&lt; waitee<span class="Delimiter">-&gt;</span>id &lt;&lt; <span class="Constant">&quot; is blocked&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L520" class="LineNr">520 </span>      waiter<span class="Delimiter">-&gt;</span>state = <a href='073scheduler.cc.html#L41'>RUNNING</a><span class="Delimiter">;</span>
 <span id="L521" class="LineNr">521 </span>      waiter<span class="Delimiter">-&gt;</span>waiting_on_routine_to_block = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L522" class="LineNr">522 </span>    <span class="Delimiter">}</span>
@@ -596,11 +596,11 @@ if ('onhashchange' in window) {
 <span id="L532" class="LineNr">532 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L533" class="LineNr">533 </span><span class="Normal">case</span> RESTART: <span class="Delimiter">{</span>
 <span id="L534" class="LineNr">534 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L535" class="LineNr">535 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'restart' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L535" class="LineNr">535 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'restart' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L536" class="LineNr">536 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L537" class="LineNr">537 </span>  <span class="Delimiter">}</span>
 <span id="L538" class="LineNr">538 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L539" class="LineNr">539 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'restart' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L539" class="LineNr">539 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'restart' should be a routine id generated by 'start-running', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L540" class="LineNr">540 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L541" class="LineNr">541 </span>  <span class="Delimiter">}</span>
 <span id="L542" class="LineNr">542 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index b3954146..fb718068 100644
--- a/html/076continuation.cc.html
+++ b/html/076continuation.cc.html
@@ -187,7 +187,7 @@ if ('onhashchange' in window) {
 <span id="L124" class="LineNr">124 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L125" class="LineNr">125 </span><span class="Normal">case</span> CALL_WITH_CONTINUATION_MARK: <span class="Delimiter">{</span>
 <span id="L126" class="LineNr">126 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires at least two ingredients: a mark number and a <a href='010vm.cc.html#L19'>recipe</a> to call</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires at least two ingredients: a mark number and a <a href='010vm.cc.html#L19'>recipe</a> to call</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L128" class="LineNr">128 </span>  <span class="Delimiter">}</span>
 <span id="L129" class="LineNr">129 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">}</span>
@@ -197,7 +197,7 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span>  <span class="Comment">// before pushing the next one on it</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L136" class="LineNr">136 </span>    ++Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;delimited continuation; incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L137" class="LineNr">137 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;delimited continuation; incrementing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L138" class="LineNr">138 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
 <span id="L140" class="LineNr">140 </span>  <a href='010vm.cc.html#L33'>instruction</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> caller_instruction = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">();</span>
@@ -239,7 +239,7 @@ if ('onhashchange' in window) {
 <span id="L176" class="LineNr">176 </span><span class="Normal">struct</span> delimited_continuation <span class="Delimiter">{</span>
 <span id="L177" class="LineNr">177 </span>  call_stack frames<span class="Delimiter">;</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Normal">int</span> nrefs<span class="Delimiter">;</span>
-<span id="L179" class="LineNr">179 </span>  delimited_continuation<span class="Delimiter">(</span>call_stack::iterator begin<span class="Delimiter">,</span> call_stack::iterator <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">)</span> :frames<span class="Delimiter">(</span>call_stack<span class="Delimiter">(</span>begin<span class="Delimiter">,</span> <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">)),</span> nrefs<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L179" class="LineNr">179 </span>  delimited_continuation<span class="Delimiter">(</span>call_stack::iterator begin<span class="Delimiter">,</span> call_stack::iterator <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">)</span> :frames<span class="Delimiter">(</span>call_stack<span class="Delimiter">(</span>begin<span class="Delimiter">,</span> <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">)),</span> nrefs<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</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="Delimiter">:(before &quot;End Globals&quot;)</span>
 <span id="L182" class="LineNr">182 </span>map&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span><span class="Delimiter">,</span> delimited_continuation&gt; Delimited_continuation<span class="Delimiter">;</span>
@@ -255,7 +255,7 @@ if ('onhashchange' in window) {
 <span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L193" class="LineNr">193 </span><span class="Normal">case</span> RETURN_CONTINUATION_UNTIL_MARK: <span class="Delimiter">{</span>
 <span id="L194" class="LineNr">194 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L195" class="LineNr">195 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires at least one ingredient: a mark tag (number)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L195" class="LineNr">195 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' requires at least one ingredient: a mark tag (number)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Delimiter">}</span>
 <span id="L197" class="LineNr">197 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
@@ -269,14 +269,14 @@ if ('onhashchange' in window) {
 <span id="L206" class="LineNr">206 </span>  <span class="Comment">// copy the current call stack until the most recent marked call</span>
 <span id="L207" class="LineNr">207 </span>  call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp;<span class="Delimiter">,</span> <span class="Normal">int</span><span class="Delimiter">);</span>  <span class="Comment">// manual prototype containing '::'</span>
 <span id="L208" class="LineNr">208 </span>  call_stack::iterator base = find_base_of_continuation<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mark tag</span><span class="Comment">*/</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value<span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't find a 'call-with-continuation-mark' to return to with tag &quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;call stack:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
-<span id="L212" class="LineNr">212 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L213" class="LineNr">213 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>base == Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L210" class="LineNr">210 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't find a 'call-with-continuation-mark' to return to with tag &quot;</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;call stack:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L213" class="LineNr">213 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;  &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> p<span class="Delimiter">-&gt;</span>running_recipe<span class="Delimiter">).</span>name &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L214" class="LineNr">214 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L215" class="LineNr">215 </span>  <span class="Delimiter">}</span>
-<span id="L216" class="LineNr">216 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating continuation &quot;</span> &lt;&lt; Next_delimited_continuation_id &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L216" class="LineNr">216 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creating continuation &quot;</span> &lt;&lt; Next_delimited_continuation_id &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L217" class="LineNr">217 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> Next_delimited_continuation_id<span class="Delimiter">,</span> delimited_continuation<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> base<span class="Delimiter">));</span>
 <span id="L218" class="LineNr">218 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != base<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L219" class="LineNr">219 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -289,16 +289,16 @@ if ('onhashchange' in window) {
 <span id="L226" class="LineNr">226 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L227" class="LineNr">227 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>Next_delimited_continuation_id<span class="Delimiter">);</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Comment">// return any other ingredients passed in</span>
-<span id="L229" class="LineNr">229 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark tag</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()));</span>
+<span id="L229" class="LineNr">229 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">skip mark tag</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()));</span>
 <span id="L230" class="LineNr">230 </span>  ++Next_delimited_continuation_id<span class="Delimiter">;</span>
 <span id="L231" class="LineNr">231 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// continue to process rest of marked call</span>
 <span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(code)</span>
 <span id="L235" class="LineNr">235 </span>call_stack::iterator find_base_of_continuation<span class="Delimiter">(</span>call_stack&amp; c<span class="Delimiter">,</span> <span class="Normal">int</span> mark_tag<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = c<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != c<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::iterator p = c<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != c<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
 <span id="L237" class="LineNr">237 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>continuation_mark_tag == mark_tag<span class="Delimiter">)</span> <span class="Identifier">return</span> p<span class="Delimiter">;</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Identifier">return</span> c<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L238" class="LineNr">238 </span>  <span class="Identifier">return</span> c<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><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="Comment">//: overload 'call' for continuations</span>
@@ -306,19 +306,19 @@ if ('onhashchange' in window) {
 <span id="L243" class="LineNr">243 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_mu_continuation<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Comment">// copy multiple calls on to current call stack</span>
 <span id="L245" class="LineNr">245 </span>  assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
-<span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling continuation &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L246" class="LineNr">246 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling continuation &quot;</span> &lt;&lt; ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span>
-<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no such delimited continuation &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L248" class="LineNr">248 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;no such delimited continuation &quot;</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Normal">const</span> call_stack&amp; new_frames = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)).</span>frames<span class="Delimiter">;</span>
 <span id="L250" class="LineNr">250 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>call_stack::const_reverse_iterator p = new_frames<span class="Delimiter">.</span>rbegin<span class="Delimiter">();</span> p != new_frames<span class="Delimiter">.</span>rend<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span>
 <span id="L251" class="LineNr">251 </span>    Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>*p<span class="Delimiter">);</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L253" class="LineNr">253 </span>    Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth += <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>new_frames<span class="Delimiter">);</span>
-<span id="L254" class="LineNr">254 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling delimited continuation; growing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L254" class="LineNr">254 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;calling delimited continuation; growing callstack depth to &quot;</span> &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L255" class="LineNr">255 </span>    assert<span class="Delimiter">(</span>Trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
 <span id="L256" class="LineNr">256 </span>  <span class="Delimiter">}</span>
 <span id="L257" class="LineNr">257 </span>  <span class="Comment">// no call housekeeping; continuations don't support next-ingredient</span>
-<span id="L258" class="LineNr">258 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">drop continuation</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
+<span id="L258" class="LineNr">258 </span>  copy<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">drop continuation</span><span class="Comment">*/</span>++ingredients<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> ingredients<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> inserter<span class="Delimiter">(</span>products<span class="Delimiter">,</span> products<span class="Delimiter">.</span>begin<span class="Delimiter">()));</span>
 <span id="L259" class="LineNr">259 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// record results of resuming 'return-continuation-until-mark' instruction</span>
 <span id="L260" class="LineNr">260 </span><span class="Delimiter">}</span>
 <span id="L261" class="LineNr">261 </span>
@@ -425,7 +425,7 @@ if ('onhashchange' in window) {
 <span id="L362" class="LineNr">362 </span><span class="Comment">// helper for debugging</span>
 <span id="L363" class="LineNr">363 </span><span class="Normal">void</span> dump<span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">int</span> continuation_id<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L364" class="LineNr">364 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L365" class="LineNr">365 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;missing delimited continuation: &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L365" class="LineNr">365 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;missing delimited continuation: &quot;</span> &lt;&lt; continuation_id &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L366" class="LineNr">366 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L367" class="LineNr">367 </span>  <span class="Delimiter">}</span>
 <span id="L368" class="LineNr">368 </span>  delimited_continuation&amp; curr = get<span class="Delimiter">(</span>Delimited_continuation<span class="Delimiter">,</span> continuation_id<span class="Delimiter">);</span>
diff --git a/html/080display.cc.html b/html/080display.cc.html
index a63e3cc5..ef5cf2f3 100644
--- a/html/080display.cc.html
+++ b/html/080display.cc.html
@@ -72,17 +72,17 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr"> 12 </span><span class="Comment">#define CHECK_SCREEN \</span>
 <span id="L13" class="LineNr"> 13 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!tb_is_active<span class="Delimiter">())</span> <span class="Delimiter">{</span> \
 <span id="L14" class="LineNr"> 14 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> \
-<span id="L15" class="LineNr"> 15 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to print to real screen in a test!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> \
+<span id="L15" class="LineNr"> 15 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to print to real screen in a test!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> \
 <span id="L16" class="LineNr"> 16 </span>      <span class="Normal">else</span> \
-<span id="L17" class="LineNr"> 17 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to print to real screen before 'open-console' or after 'close-console'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> \
+<span id="L17" class="LineNr"> 17 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to print to real screen before 'open-console' or after 'close-console'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> \
 <span id="L18" class="LineNr"> 18 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span> \
 <span id="L19" class="LineNr"> 19 </span>    <span class="Delimiter">}</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Comment">#define CHECK_CONSOLE \</span>
 <span id="L21" class="LineNr"> 21 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!tb_is_active<span class="Delimiter">())</span> <span class="Delimiter">{</span> \
 <span id="L22" class="LineNr"> 22 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> \
-<span id="L23" class="LineNr"> 23 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to read event from real keyboard/mouse in a test!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> \
+<span id="L23" class="LineNr"> 23 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to read event from real keyboard/mouse in a test!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> \
 <span id="L24" class="LineNr"> 24 </span>      <span class="Normal">else</span> \
-<span id="L25" class="LineNr"> 25 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to read event from real keyboard/mouse before 'open-console' or after 'close-console'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> \
+<span id="L25" class="LineNr"> 25 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to read event from real keyboard/mouse before 'open-console' or after 'close-console'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>
@@ -103,9 +103,9 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>  <span class="Normal">int</span> height = tb_height<span class="Delimiter">();</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>width &gt; <span class="Constant">222</span> || height &gt; <span class="Constant">222</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>width &gt; <span class="Constant">222</span><span class="Delimiter">)</span>
-<span id="L46" class="LineNr"> 46 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;sorry, Mu doesn't support windows wider than 222 characters in console mode. Please resize your window.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;sorry, Mu doesn't support windows wider than 222 characters in console mode. Please resize your window.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>height &gt; <span class="Constant">222</span><span class="Delimiter">)</span>
-<span id="L48" class="LineNr"> 48 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;sorry, Mu doesn't support windows taller than 222 characters in console mode. Please resize your window.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;sorry, Mu doesn't support windows taller than 222 characters in console mode. Please resize your window.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><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>
@@ -148,22 +148,22 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Normal">case</span> PRINT_CHARACTER_TO_DISPLAY: <span class="Delimiter">{</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'print-character-to-display' requires at least one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'print-character-to-display' requires at least one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'print-character-to-display' should be a character, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'print-character-to-display' should be a character, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<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#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'print-character-to-display' should be a foreground color number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L100" class="LineNr">100 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'print-character-to-display' should be a foreground color number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Delimiter">}</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Delimiter">}</span>
 <span id="L104" class="LineNr">104 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> &gt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L105" class="LineNr">105 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;third ingredient of 'print-character-to-display' should be a background color number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;third ingredient of 'print-character-to-display' should be a background color number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L107" class="LineNr">107 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Delimiter">}</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
@@ -230,15 +230,15 @@ if ('onhashchange' in window) {
 <span id="L170" class="LineNr">170 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L171" class="LineNr">171 </span><span class="Normal">case</span> MOVE_CURSOR_ON_DISPLAY: <span class="Delimiter">{</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'move-cursor-on-display' requires two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'move-cursor-on-display' requires two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L174" class="LineNr">174 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
 <span id="L176" class="LineNr">176 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L177" class="LineNr">177 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'move-cursor-on-display' should be a row number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'move-cursor-on-display' should be a row number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L178" class="LineNr">178 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Delimiter">}</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L181" class="LineNr">181 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'move-cursor-on-display' should be a column number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L181" class="LineNr">181 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'move-cursor-on-display' should be a column number, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index 577bcd2b..68c96f9a 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -232,10 +232,10 @@ if ('onhashchange' in window) {
 <span id="L167" class="LineNr">167 </span><span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>name == <span class="Constant">&quot;assume-screen&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L168" class="LineNr">168 </span>  curr<span class="Delimiter">.</span>name = <span class="Constant">&quot;new-fake-screen&quot;</span><span class="Delimiter">;</span>
 <span id="L169" class="LineNr">169 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: 'assume-screen' has no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: 'assume-screen' has no products</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L171" class="LineNr">171 </span>  <span class="Delimiter">}</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>result<span class="Delimiter">.</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;scenario_&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: 'assume-screen' can't be called here, only in scenarios</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L173" class="LineNr">173 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; result<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;: 'assume-screen' can't be called here, only in scenarios</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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">else</span> <span class="Delimiter">{</span>
 <span id="L176" class="LineNr">176 </span>    assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
@@ -259,11 +259,11 @@ if ('onhashchange' in window) {
 <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L195" class="LineNr">195 </span><span class="Normal">case</span> SCREEN_SHOULD_CONTAIN: <span class="Delimiter">{</span>
 <span id="L196" class="LineNr">196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L197" class="LineNr">197 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'screen-should-contain' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L197" class="LineNr">197 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'screen-should-contain' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</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="Delimiter">}</span>
 <span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L201" class="LineNr">201 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'screen-should-contain' should be a literal string, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L201" class="LineNr">201 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'screen-should-contain' should be a literal string, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L202" class="LineNr">202 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L203" class="LineNr">203 </span>  <span class="Delimiter">}</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -283,15 +283,15 @@ if ('onhashchange' in window) {
 <span id="L218" class="LineNr">218 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L219" class="LineNr">219 </span><span class="Normal">case</span> SCREEN_SHOULD_CONTAIN_IN_COLOR: <span class="Delimiter">{</span>
 <span id="L220" class="LineNr">220 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L221" class="LineNr">221 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'screen-should-contain-in-color' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L221" class="LineNr">221 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'screen-should-contain-in-color' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L222" class="LineNr">222 </span>    <span class="Identifier">break</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">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L225" class="LineNr">225 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'screen-should-contain-in-color' should be a number (color code), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L225" class="LineNr">225 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'screen-should-contain-in-color' should be a number (color code), but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_literal_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L229" class="LineNr">229 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'screen-should-contain-in-color' should be a literal string, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L229" class="LineNr">229 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of 'screen-should-contain-in-color' should be a literal string, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L230" class="LineNr">230 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -346,7 +346,7 @@ if ('onhashchange' in window) {
 <span id="L281" class="LineNr">281 </span>    cursor<span class="Delimiter">.</span><a href='011load.cc.html#L211'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L282" class="LineNr">282 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>at_end<span class="Delimiter">())</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L283" class="LineNr">283 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L284" class="LineNr">284 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;each row of the expected screen should start with a '.'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L284" class="LineNr">284 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;each row of the expected screen should start with a '.'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L285" class="LineNr">285 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L286" class="LineNr">286 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L287" class="LineNr">287 </span>    <span class="Delimiter">}</span>
@@ -363,7 +363,7 @@ if ('onhashchange' in window) {
 <span id="L298" class="LineNr">298 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>color == -<span class="Constant">1</span> || color == <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr+cell_color_offset<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L299" class="LineNr">299 </span>        <span class="Comment">// contents match but color is off</span>
 <span id="L300" class="LineNr">300 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain '&quot;</span> &lt;&lt; unicode_character_at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in color &quot;</span> &lt;&lt; color &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr+cell_color_offset<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L301" class="LineNr">301 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain '&quot;</span> &lt;&lt; unicode_character_at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' in color &quot;</span> &lt;&lt; color &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr+cell_color_offset<span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L302" class="LineNr">302 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> dump_screen<span class="Delimiter">();</span>
 <span id="L303" class="LineNr">303 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L304" class="LineNr">304 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -385,20 +385,20 @@ if ('onhashchange' in window) {
 <span id="L320" class="LineNr">320 </span>      ostringstream color_phrase<span class="Delimiter">;</span>
 <span id="L321" class="LineNr">321 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>color != -<span class="Constant">1</span><span class="Delimiter">)</span> color_phrase &lt;&lt; <span class="Constant">&quot; in color &quot;</span> &lt;&lt; color<span class="Delimiter">;</span>
 <span id="L322" class="LineNr">322 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L323" class="LineNr">323 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain &quot;</span> &lt;&lt; curr &lt;&lt; expected_pretty &lt;&lt; color_phrase<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr<span class="Delimiter">))</span> &lt;&lt; actual_pretty &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L323" class="LineNr">323 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;F - &quot;</span> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen location (&quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; column &lt;&lt; <span class="Constant">&quot;) to contain &quot;</span> &lt;&lt; curr &lt;&lt; expected_pretty &lt;&lt; color_phrase<span class="Delimiter">.</span>str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot; instead of &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr<span class="Delimiter">))</span> &lt;&lt; actual_pretty &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L324" class="LineNr">324 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Hide_errors<span class="Delimiter">)</span> dump_screen<span class="Delimiter">();</span>
 <span id="L325" class="LineNr">325 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L326" class="LineNr">326 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L327" class="LineNr">327 </span>    <span class="Delimiter">}</span>
 <span id="L328" class="LineNr">328 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>cursor<span class="Delimiter">.</span>get<span class="Delimiter">()</span> != <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L329" class="LineNr">329 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;row &quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot; of the expected screen is too long</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L329" class="LineNr">329 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;row &quot;</span> &lt;&lt; row &lt;&lt; <span class="Constant">&quot; of the expected screen is too long</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L330" class="LineNr">330 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!Scenario_testing_scenario<span class="Delimiter">)</span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L331" class="LineNr">331 </span>      <span class="Identifier">return</span><span class="Delimiter">;</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>  cursor<span class="Delimiter">.</span><a href='011load.cc.html#L211'>skip_whitespace_and_comments</a><span class="Delimiter">();</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!cursor<span class="Delimiter">.</span>at_end<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen has too many rows</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;expected screen has too many rows</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L337" class="LineNr">337 </span>    Passed =<span class="Constant"> false</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="Delimiter">}</span>
@@ -413,7 +413,7 @@ if ('onhashchange' in window) {
 <span id="L348" class="LineNr">348 </span><span class="Normal">bool</span> raw_string_stream::at_end<span class="Delimiter">()</span> <span class="Normal">const</span> <span class="Delimiter">{</span>
 <span id="L349" class="LineNr">349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>index &gt;= max<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>tb_utf8_char_length<span class="Delimiter">(</span>buf[index]<span class="Delimiter">)</span> &gt; max-index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L351" class="LineNr">351 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;unicode string seems corrupted at index &quot;</span>&lt;&lt; index &lt;&lt; <span class="Constant">&quot; character &quot;</span> &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>buf[index]<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L351" class="LineNr">351 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;unicode string seems corrupted at index &quot;</span>&lt;&lt; index &lt;&lt; <span class="Constant">&quot; character &quot;</span> &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>buf[index]<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L352" class="LineNr">352 </span>    <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L353" class="LineNr">353 </span>  <span class="Delimiter">}</span>
 <span id="L354" class="LineNr">354 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index c170c314..43eb7d4b 100644
--- a/html/085scenario_console.cc.html
+++ b/html/085scenario_console.cc.html
@@ -127,7 +127,7 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </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#L141'>SIZE</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="Normal">const</span> instruction&amp; inst = r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;left-click&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L69" class="LineNr"> 69 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'left-click' event starting at &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L69" class="LineNr"> 69 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'left-click' event starting at &quot;</span> &lt;&lt; Current_routine<span class="Delimiter">-&gt;</span>alloc &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L70" class="LineNr"> 70 </span>      <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">tag for 'touch-event' variant of 'event' exclusive-container</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L71" class="LineNr"> 71 </span>      <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'type' in 'mouse-event'</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">,</span> TB_KEY_MOUSE_LEFT<span class="Delimiter">);</span>
 <span id="L72" class="LineNr"> 72 </span>      <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Comment">/*</span><span class="Comment">skip tag</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'row' in 'mouse-event'</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> to_integer<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">));</span>
@@ -135,14 +135,14 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span>      curr_address += <a href='085scenario_console.cc.html#L292'>size_of_event</a><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">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;press&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L77" class="LineNr"> 77 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'press' event starting at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L77" class="LineNr"> 77 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'press' event starting at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L78" class="LineNr"> 78 </span>      string key = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span>
 <span id="L79" class="LineNr"> 79 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span>key<span class="Delimiter">))</span>
 <span id="L80" class="LineNr"> 80 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Constant">1</span><span class="Delimiter">,</span> to_integer<span class="Delimiter">(</span>key<span class="Delimiter">));</span>
 <span id="L81" class="LineNr"> 81 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Key<span class="Delimiter">,</span> key<span class="Delimiter">))</span>
 <span id="L82" class="LineNr"> 82 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Constant">1</span><span class="Delimiter">,</span> Key[key]<span class="Delimiter">);</span>
 <span id="L83" class="LineNr"> 83 </span>      <span class="Normal">else</span>
-<span id="L84" class="LineNr"> 84 </span>        <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;assume-console: can't press '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>        <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;assume-console: can't press '&quot;</span> &lt;&lt; key &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L85" class="LineNr"> 85 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Constant">1</span><span class="Delimiter">)</span> &lt; <span class="Constant">256</span><span class="Delimiter">)</span>
 <span id="L86" class="LineNr"> 86 </span>        <span class="Comment">// these keys are in ascii</span>
 <span id="L87" class="LineNr"> 87 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">tag for 'text' variant of 'event' exclusive-container</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -156,18 +156,18 @@ if ('onhashchange' in window) {
 <span id="L95" class="LineNr"> 95 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L96" class="LineNr"> 96 </span>      <span class="Comment">// keyboard input</span>
 <span id="L97" class="LineNr"> 97 </span>      assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">&quot;type&quot;</span><span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>      <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'type' event starting at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span>      <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'type' event starting at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L99" class="LineNr"> 99 </span>      <span class="Normal">const</span> string&amp; contents = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span>      <span class="Normal">const</span> <span class="Normal">char</span>* raw_contents = contents<span class="Delimiter">.</span>c_str<span class="Delimiter">();</span>
 <span id="L101" class="LineNr">101 </span>      <span class="Normal">int</span> num_keyboard_events = <a href='038new_text.cc.html#L130'>unicode_length</a><span class="Delimiter">(</span>contents<span class="Delimiter">);</span>
 <span id="L102" class="LineNr">102 </span>      <span class="Normal">int</span> curr = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L103" class="LineNr">103 </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_keyboard_events<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'text' tag at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 'text' tag at &quot;</span> &lt;&lt; curr_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L105" class="LineNr">105 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">tag for 'text' variant of 'event' exclusive-container</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>        <span class="Normal">uint32_t</span> curr_character<span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span>        assert<span class="Delimiter">(</span>curr &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">));</span>
 <span id="L108" class="LineNr">108 </span>        tb_utf8_char_to_unicode<span class="Delimiter">(</span>&amp;curr_character<span class="Delimiter">,</span> &amp;raw_contents[curr]<span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>        <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; curr_address+<span class="Comment">/*</span><span class="Comment">skip exclusive container tag</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>        <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing character &quot;</span> &lt;&lt; curr_character &lt;&lt; <span class="Constant">&quot; at &quot;</span> &lt;&lt; curr_address+<span class="Comment">/*</span><span class="Comment">skip exclusive container tag</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L110" class="LineNr">110 </span>        <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr_address+<span class="Comment">/*</span><span class="Comment">skip exclusive container tag</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> curr_character<span class="Delimiter">);</span>
 <span id="L111" class="LineNr">111 </span>        curr += tb_utf8_char_length<span class="Delimiter">(</span>raw_contents[curr]<span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>        curr_address += <a href='085scenario_console.cc.html#L292'>size_of_event</a><span class="Delimiter">();</span>
@@ -177,9 +177,9 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span>  assert<span class="Delimiter">(</span>curr_address == event_data_address+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span>+size<span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Comment">// wrap the array of events in a console object</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">int</span> console_address = allocate<span class="Delimiter">(</span><a href='085scenario_console.cc.html#L302'>size_of_console</a><span class="Delimiter">());</span>
-<span id="L119" class="LineNr">119 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing console in &quot;</span> &lt;&lt; console_address &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing console in &quot;</span> &lt;&lt; console_address &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> CONSOLE+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> console_address<span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing console data in &quot;</span> &lt;&lt; console_address+<span class="Comment">/*</span><span class="Comment">offset of 'data' in container 'events'</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing console data in &quot;</span> &lt;&lt; console_address+<span class="Comment">/*</span><span class="Comment">offset of 'data' in container 'events'</span><span class="Comment">*/</span><span class="Constant">1</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> console_address+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'data' in container 'events'</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">skip alloc id of 'data'</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> event_data_address<span class="Delimiter">);</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L124" class="LineNr">124 </span><span class="Delimiter">}</span>
@@ -322,7 +322,7 @@ if ('onhashchange' in window) {
 <span id="L261" class="LineNr">261 </span><span class="Normal">case</span> REPLACE_IN_CONSOLE: <span class="Delimiter">{</span>
 <span id="L262" class="LineNr">262 </span>  assert<span class="Delimiter">(</span>scalar<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)));</span>
 <span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> CONSOLE<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L264" class="LineNr">264 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;console not initialized</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L264" class="LineNr">264 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;console not initialized</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L265" class="LineNr">265 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L266" class="LineNr">266 </span>  <span class="Delimiter">}</span>
 <span id="L267" class="LineNr">267 </span>  <span class="Normal">int</span> console_address = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> CONSOLE<span class="Delimiter">);</span>
diff --git a/html/087file.cc.html b/html/087file.cc.html
index 54959e7a..bb5cacec 100644
--- a/html/087file.cc.html
+++ b/html/087file.cc.html
@@ -75,19 +75,19 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr"> 16 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Normal">case</span> _OPEN_FILE_FOR_READING: <span class="Delimiter">{</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L19" class="LineNr"> 19 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-reading' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-reading' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L20" class="LineNr"> 20 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Delimiter">}</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-file-for-reading' should be a string, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-file-for-reading' should be a string, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-reading' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-reading' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-file-for-reading' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-file-for-reading' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -110,19 +110,19 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">case</span> _OPEN_FILE_FOR_WRITING: <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#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-writing' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-writing' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Delimiter">}</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-file-for-writing' should be a string, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-file-for-writing' should be a string, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Delimiter">}</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-writing' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-file-for-writing' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-file-for-writing' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-file-for-writing' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -144,23 +144,23 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Normal">case</span> _READ_FROM_FILE: <span class="Delimiter">{</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-file' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-file' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L92" class="LineNr"> 92 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$read-from-file' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$read-from-file' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L93" class="LineNr"> 93 </span>    <span class="Identifier">break</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><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-file' requires exactly two products, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-file' requires exactly two products, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Identifier">break</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>!is_mu_character<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$read-from-file' should be a character, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$read-from-file' should be a character, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Delimiter">}</span>
 <span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second product of '$read-from-file' should be a boolean, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L104" class="LineNr">104 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second product of '$read-from-file' should be a boolean, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L105" class="LineNr">105 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Delimiter">}</span>
 <span id="L107" class="LineNr">107 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -170,7 +170,7 @@ if ('onhashchange' in window) {
 <span id="L111" class="LineNr">111 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> x = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">FILE</span>* f = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">FILE</span>*&gt;<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L113" class="LineNr">113 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>f == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L114" class="LineNr">114 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't read from null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't read from null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L115" class="LineNr">115 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L116" class="LineNr">116 </span>  <span class="Delimiter">}</span>
 <span id="L117" class="LineNr">117 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -180,7 +180,7 @@ if ('onhashchange' in window) {
 <span id="L121" class="LineNr">121 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>  <span class="Normal">char</span> c = getc<span class="Delimiter">(</span>f<span class="Delimiter">);</span>  <span class="Comment">// todo: unicode</span>
@@ -190,8 +190,8 @@ if ('onhashchange' in window) {
 <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 class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't read from file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  errno: &quot;</span> &lt;&lt; errno &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L134" class="LineNr">134 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't read from file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  errno: &quot;</span> &lt;&lt; errno &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L136" class="LineNr">136 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Delimiter">}</span>
 <span id="L138" class="LineNr">138 </span>  products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
@@ -208,19 +208,19 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr">149 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L150" class="LineNr">150 </span><span class="Normal">case</span> _WRITE_TO_FILE: <span class="Delimiter">{</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$write-to-file' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$write-to-file' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L153" class="LineNr">153 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Delimiter">}</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L156" class="LineNr">156 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$write-to-file' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$write-to-file' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L157" class="LineNr">157 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!is_mu_character<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of '$write-to-file' should be a character, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L160" class="LineNr">160 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of '$write-to-file' should be a character, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L161" class="LineNr">161 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L164" class="LineNr">164 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$write-to-file' writes to no products, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$write-to-file' writes to no products, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L165" class="LineNr">165 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -230,20 +230,20 @@ if ('onhashchange' in window) {
 <span id="L171" class="LineNr">171 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> x = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L172" class="LineNr">172 </span>  <span class="Normal">FILE</span>* f = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">FILE</span>*&gt;<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L173" class="LineNr">173 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>f == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L174" class="LineNr">174 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;can't write to null file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</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>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>feof<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;file in invalid state in '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L180" class="LineNr">180 </span>    <span class="Identifier">break</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="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> y = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L183" class="LineNr">183 </span>  <span class="Normal">char</span> c = <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span>y<span class="Delimiter">);</span>
 <span id="L184" class="LineNr">184 </span>  putc<span class="Delimiter">(</span>c<span class="Delimiter">,</span> f<span class="Delimiter">);</span>  <span class="Comment">// todo: unicode</span>
 <span id="L185" class="LineNr">185 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ferror<span class="Delimiter">(</span>f<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L186" class="LineNr">186 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't write to file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;  errno: &quot;</span> &lt;&lt; errno &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L186" class="LineNr">186 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;couldn't write to file in '&quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;  errno: &quot;</span> &lt;&lt; errno &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -256,19 +256,19 @@ if ('onhashchange' in window) {
 <span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L198" class="LineNr">198 </span><span class="Normal">case</span> _CLOSE_FILE: <span class="Delimiter">{</span>
 <span id="L199" class="LineNr">199 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L200" class="LineNr">200 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-file' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L200" class="LineNr">200 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-file' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L201" class="LineNr">201 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L204" class="LineNr">204 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$close-file' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L204" class="LineNr">204 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$close-file' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L205" class="LineNr">205 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L206" class="LineNr">206 </span>  <span class="Delimiter">}</span>
 <span id="L207" class="LineNr">207 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-file' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L208" class="LineNr">208 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-file' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L209" class="LineNr">209 </span>    <span class="Identifier">break</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>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-file' requires its product to be the same as its ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-file' requires its product to be the same as its ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L213" class="LineNr">213 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 519978a8..2ca58946 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -178,49 +178,49 @@ if ('onhashchange' in window) {
 <span id="L117" class="LineNr">117 </span>    string filename = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>filename<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L119" class="LineNr">119 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L120" class="LineNr">120 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L226'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L120" class="LineNr">120 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L225'>end</a> of file (0)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L121" class="LineNr">121 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span>    <span class="Delimiter">}</span>
 <span id="L123" class="LineNr">123 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*filename<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L124" class="LineNr">124 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must begin with a '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L124" class="LineNr">124 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must begin with a '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Delimiter">}</span>
 <span id="L127" class="LineNr">127 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*filename<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">']'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must <a href='003trace.cc.html#L226'>end</a> with a ']'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must <a href='003trace.cc.html#L225'>end</a> with a ']'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L129" class="LineNr">129 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>    <span class="Delimiter">}</span>
 <span id="L131" class="LineNr">131 </span>    filename<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L132" class="LineNr">132 </span>    filename<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>filename<span class="Delimiter">)</span>-<span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L133" class="LineNr">133 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: no data for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L134" class="LineNr">134 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: no data for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span>    <span class="Delimiter">}</span>
 <span id="L137" class="LineNr">137 </span>    string arrow = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L138" class="LineNr">138 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>arrow<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L139" class="LineNr">139 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L140" class="LineNr">140 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L226'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L140" class="LineNr">140 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L225'>end</a> of file (1)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L141" class="LineNr">141 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L142" class="LineNr">142 </span>    <span class="Delimiter">}</span>
 <span id="L143" class="LineNr">143 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>arrow != <span class="Constant">&quot;&lt;-&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: expected '&lt;-' after filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' but got '&quot;</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L144" class="LineNr">144 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: expected '&lt;-' after filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' but got '&quot;</span> &lt;&lt; arrow &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L145" class="LineNr">145 </span>      <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr">148 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: no data for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' after '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L148" class="LineNr">148 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: no data for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' after '&lt;-'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>    string contents = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L153" class="LineNr">153 </span>      assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span>
-<span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L226'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;incomplete 'resources' block at <a href='003trace.cc.html#L225'>end</a> of file (2)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L155" class="LineNr">155 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span>    <span class="Delimiter">}</span>
 <span id="L157" class="LineNr">157 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*contents<span class="Delimiter">.</span>begin<span class="Delimiter">()</span> != <span class="Constant">'['</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L158" class="LineNr">158 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents '&quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;' for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must begin with a '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L158" class="LineNr">158 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents '&quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;' for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must begin with a '['</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L159" class="LineNr">159 </span>      <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>*contents<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">']'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents '&quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;' for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must <a href='003trace.cc.html#L226'>end</a> with a ']'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L162" class="LineNr">162 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents '&quot;</span> &lt;&lt; contents &lt;&lt; <span class="Constant">&quot;' for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must <a href='003trace.cc.html#L225'>end</a> with a ']'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>    contents<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
@@ -240,7 +240,7 @@ if ('onhashchange' in window) {
 <span id="L179" class="LineNr">179 </span>    <a href='038new_text.cc.html#L229'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L180" class="LineNr">180 </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="L181" class="LineNr">181 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="Constant">'|'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must be delimited in '|'s</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents for filename '&quot;</span> &lt;&lt; filename &lt;&lt; <span class="Constant">&quot;' must be delimited in '|'s</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L183" class="LineNr">183 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L184" class="LineNr">184 </span>    <span class="Delimiter">}</span>
 <span id="L185" class="LineNr">185 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>  <span class="Comment">// skip leading '|'</span>
@@ -251,7 +251,7 @@ if ('onhashchange' in window) {
 <span id="L190" class="LineNr">190 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>line<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == <span class="cSpecial">'\\'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L191" class="LineNr">191 </span>        ++i<span class="Delimiter">;</span>  <span class="Comment">// skip</span>
 <span id="L192" class="LineNr">192 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>line<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L193" class="LineNr">193 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents can't end a line with '</span><span class="cSpecial">\\</span><span class="Constant">'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L193" class="LineNr">193 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; caller &lt;&lt; <span class="Constant">&quot;: assume-resources: file contents can't end a line with '</span><span class="cSpecial">\\</span><span class="Constant">'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L194" class="LineNr">194 </span>          <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L195" class="LineNr">195 </span>        <span class="Delimiter">}</span>
 <span id="L196" class="LineNr">196 </span>      <span class="Delimiter">}</span>
@@ -266,27 +266,27 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr">205 </span><span class="Normal">void</span> <a href='089scenario_filesystem.cc.html#L205'>construct_resources_object</a><span class="Delimiter">(</span><span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> string&gt;&amp; contents<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L206" class="LineNr">206 </span>  <span class="Normal">int</span> resources_data_address = allocate<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">)</span> * <span class="Comment">/*</span><span class="Comment">size of resource</span><span class="Comment">*/</span><span class="Constant">4</span> + <span class="Comment">/*</span><span class="Comment">array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L207" class="LineNr">207 </span>  <span class="Normal">int</span> curr = resources_data_address + <span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span> + <span class="Comment">/*</span><span class="Comment">skip array length</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::const_iterator p = contents<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != contents<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::const_iterator p = contents<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != contents<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L209" class="LineNr">209 </span>    ++curr<span class="Delimiter">;</span>  <span class="Comment">// skip alloc id of resource.name</span>
 <span id="L210" class="LineNr">210 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <a href='038new_text.cc.html#L39'>new_mu_text</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first<span class="Delimiter">));</span>
-<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing file name &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing file name &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L212" class="LineNr">212 </span>    ++curr<span class="Delimiter">;</span>
 <span id="L213" class="LineNr">213 </span>    ++curr<span class="Delimiter">;</span>  <span class="Comment">// skip alloc id of resource.contents</span>
 <span id="L214" class="LineNr">214 </span>    <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <a href='038new_text.cc.html#L39'>new_mu_text</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>second<span class="Delimiter">));</span>
-<span id="L215" class="LineNr">215 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing file contents &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing file contents &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L216" class="LineNr">216 </span>    ++curr<span class="Delimiter">;</span>
 <span id="L217" class="LineNr">217 </span>  <span class="Delimiter">}</span>
 <span id="L218" class="LineNr">218 </span>  curr = resources_data_address + <span class="Comment">/*</span><span class="Comment">skip alloc id of resources.data</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>contents<span class="Delimiter">));</span>  <span class="Comment">// array length</span>
-<span id="L220" class="LineNr">220 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources size &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L220" class="LineNr">220 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources size &quot;</span> &lt;&lt; get<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L221" class="LineNr">221 </span>  <span class="Comment">// wrap the resources data in a 'resources' object</span>
 <span id="L222" class="LineNr">222 </span>  <span class="Normal">int</span> resources_address = allocate<span class="Delimiter">(</span><a href='089scenario_filesystem.cc.html#L231'>size_of_resources</a><span class="Delimiter">());</span>
 <span id="L223" class="LineNr">223 </span>  curr = resources_address+<span class="Comment">/*</span><span class="Comment">alloc id</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">offset of 'data' element</span><span class="Comment">*/</span><span class="Constant">1</span>+<span class="Comment">/*</span><span class="Comment">skip alloc id of 'data' element</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> resources_data_address<span class="Delimiter">);</span>
-<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources data <a href='043space.cc.html#L101'>address</a> &quot;</span> &lt;&lt; resources_data_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources data <a href='043space.cc.html#L101'>address</a> &quot;</span> &lt;&lt; resources_data_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; curr &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L226" class="LineNr">226 </span>  <span class="Comment">// save in product</span>
 <span id="L227" class="LineNr">227 </span>  <a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> RESOURCES+<span class="Comment">/*</span><span class="Comment">skip alloc id</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> resources_address<span class="Delimiter">);</span>
-<span id="L228" class="LineNr">228 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources <a href='043space.cc.html#L101'>address</a> &quot;</span> &lt;&lt; resources_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; RESOURCES &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L228" class="LineNr">228 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing resources <a href='043space.cc.html#L101'>address</a> &quot;</span> &lt;&lt; resources_address &lt;&lt; <span class="Constant">&quot; in location &quot;</span> &lt;&lt; RESOURCES &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="Normal">int</span> <a href='089scenario_filesystem.cc.html#L231'>size_of_resources</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
diff --git a/html/091socket.cc.html b/html/091socket.cc.html
index 7fa12274..b77476ab 100644
--- a/html/091socket.cc.html
+++ b/html/091socket.cc.html
@@ -77,23 +77,23 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> _OPEN_CLIENT_SOCKET: <span class="Delimiter">{</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L20" class="LineNr"> 20 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-client-socket' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-client-socket' requires exactly two ingredients, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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">}</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-client-socket' should be text (the hostname), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-client-socket' should be text (the hostname), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Delimiter">}</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of '$open-client-socket' should be a number (the port of the hostname to connect to), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second ingredient of '$open-client-socket' should be a number (the port of the hostname to connect to), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L29" class="LineNr"> 29 </span>    <span class="Identifier">break</span><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">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-client-socket' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-client-socket' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L33" class="LineNr"> 33 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr"> 34 </span>  <span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-client-socket' should be a number (socket handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-client-socket' should be a number (socket handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -118,7 +118,7 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span>  socket_t* result = <span class="Normal">new</span> socket_t<span class="Delimiter">;</span>
 <span id="L59" class="LineNr"> 59 </span>  result<span class="Delimiter">-&gt;</span>fd = socket<span class="Delimiter">(</span>AF_INET<span class="Delimiter">,</span> SOCK_STREAM<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L60" class="LineNr"> 60 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">-&gt;</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to create socket.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to create socket.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L63" class="LineNr"> 63 </span>  <span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>  result<span class="Delimiter">-&gt;</span>addr<span class="Delimiter">.</span>sin_family = AF_INET<span class="Delimiter">;</span>
@@ -128,7 +128,7 @@ if ('onhashchange' in window) {
 <span id="L68" class="LineNr"> 68 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>connect<span class="Delimiter">(</span>result<span class="Delimiter">-&gt;</span>fd<span class="Delimiter">,</span> <span class="Normal">reinterpret_cast</span>&lt;sockaddr*&gt;<span class="Delimiter">(</span>&amp;result<span class="Delimiter">-&gt;</span>addr<span class="Delimiter">),</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span>result<span class="Delimiter">-&gt;</span>addr<span class="Delimiter">))</span> &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L69" class="LineNr"> 69 </span>    close<span class="Delimiter">(</span>result<span class="Delimiter">-&gt;</span>fd<span class="Delimiter">);</span>
 <span id="L70" class="LineNr"> 70 </span>    result<span class="Delimiter">-&gt;</span>fd = -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to connect to &quot;</span> &lt;&lt; host &lt;&lt; <span class="Constant">':'</span> &lt;&lt; port &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to connect to &quot;</span> &lt;&lt; host &lt;&lt; <span class="Constant">':'</span> &lt;&lt; port &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L72" class="LineNr"> 72 </span>  <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>
@@ -140,19 +140,19 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Normal">case</span> _OPEN_SERVER_SOCKET: <span class="Delimiter">{</span>
 <span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L83" class="LineNr"> 83 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-server-socket' requires exactly one ingredient (the port to listen for requests on), but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L83" class="LineNr"> 83 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-server-socket' requires exactly one ingredient (the port to listen for requests on), but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L85" class="LineNr"> 85 </span>  <span class="Delimiter">}</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-server-socket' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$open-server-socket' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<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#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-server-socket' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$open-server-socket' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-server-socket' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$open-server-socket' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -176,7 +176,7 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span>  socket_t* result = <span class="Normal">new</span> socket_t<span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span>  result<span class="Delimiter">-&gt;</span>fd = socket<span class="Delimiter">(</span>AF_INET<span class="Delimiter">,</span> SOCK_STREAM<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">-&gt;</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to create server socket.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to create server socket.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L120" class="LineNr">120 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Delimiter">}</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Normal">int</span> dummy = <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -190,7 +190,7 @@ if ('onhashchange' in window) {
 <span id="L130" class="LineNr">130 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L131" class="LineNr">131 </span>    close<span class="Delimiter">(</span>result<span class="Delimiter">-&gt;</span>fd<span class="Delimiter">);</span>
 <span id="L132" class="LineNr">132 </span>    result<span class="Delimiter">-&gt;</span>fd = -<span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to bind result socket to port &quot;</span> &lt;&lt; port &lt;&lt; <span class="Constant">&quot;. Something's already using that port.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L133" class="LineNr">133 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <span class="Constant">&quot;Failed to bind result socket to port &quot;</span> &lt;&lt; port &lt;&lt; <span class="Constant">&quot;. Something's already using that port.</span><span class="cSpecial">\n</span><span class="Constant">&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="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span><span class="Delimiter">}</span>
@@ -202,19 +202,19 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L143" class="LineNr">143 </span><span class="Normal">case</span> _ACCEPT: <span class="Delimiter">{</span>
 <span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$accept' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$accept' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L146" class="LineNr">146 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L147" class="LineNr">147 </span>  <span class="Delimiter">}</span>
 <span id="L148" class="LineNr">148 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$accept' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L149" class="LineNr">149 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$accept' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L150" class="LineNr">150 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Delimiter">}</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$accept' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$accept' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L154" class="LineNr">154 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$accept' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$accept' should be a number (file handle), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L158" class="LineNr">158 </span>    <span class="Identifier">break</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="Identifier">break</span><span class="Delimiter">;</span>
@@ -251,32 +251,32 @@ if ('onhashchange' in window) {
 <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L192" class="LineNr">192 </span><span class="Normal">case</span> _READ_FROM_SOCKET: <span class="Delimiter">{</span>
 <span id="L193" class="LineNr">193 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L194" class="LineNr">194 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-socket' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L194" class="LineNr">194 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-socket' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L198" class="LineNr">198 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$read-from-socket' should be a number (socket), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L198" class="LineNr">198 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$read-from-socket' should be a number (socket), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Normal">int</span> nprod = <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">);</span>
 <span id="L202" class="LineNr">202 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>nprod == <span class="Constant">0</span> || nprod &gt; <span class="Constant">4</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L203" class="LineNr">203 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-socket' requires 1-4 products, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L203" class="LineNr">203 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$read-from-socket' requires 1-4 products, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L204" class="LineNr">204 </span>    <span class="Identifier">break</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">if</span> <span class="Delimiter">(</span>!is_mu_character<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L207" class="LineNr">207 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$read-from-socket' should be a character, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L207" class="LineNr">207 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first product of '$read-from-socket' should be a character, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L208" class="LineNr">208 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span>nprod &gt; <span class="Constant">1</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second product of '$read-from-socket' should be a boolean (data received?), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;second product of '$read-from-socket' should be a boolean (data received?), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L212" class="LineNr">212 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L213" class="LineNr">213 </span>  <span class="Delimiter">}</span>
 <span id="L214" class="LineNr">214 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>nprod &gt; <span class="Constant">2</span> &amp;&amp; !is_mu_boolean<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L215" class="LineNr">215 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;third product of '$read-from-socket' should be a boolean (eof?), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L215" class="LineNr">215 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;third product of '$read-from-socket' should be a boolean (eof?), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L216" class="LineNr">216 </span>    <span class="Identifier">break</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>nprod &gt; <span class="Constant">3</span> &amp;&amp; !is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L219" class="LineNr">219 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;fourth product of '$read-from-socket' should be a number (error code), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L219" class="LineNr">219 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;fourth product of '$read-from-socket' should be a number (error code), but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">3</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L220" class="LineNr">220 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L221" class="LineNr">221 </span>  <span class="Delimiter">}</span>
 <span id="L222" class="LineNr">222 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -312,7 +312,7 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span>    <span class="Delimiter">}</span>
 <span id="L253" class="LineNr">253 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>poll_result &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L254" class="LineNr">254 </span>      <span class="Normal">int</span> error_code = errno<span class="Delimiter">;</span>
-<span id="L255" class="LineNr">255 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;error in $read-from-socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>      <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;error in $read-from-socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L256" class="LineNr">256 </span>      products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">no data</span><span class="Comment">*/</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L257" class="LineNr">257 </span>      products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">found</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span>
 <span id="L258" class="LineNr">258 </span>      products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">eof</span><span class="Comment">*/</span><span class="Constant">false</span><span class="Delimiter">);</span>
@@ -344,7 +344,7 @@ if ('onhashchange' in window) {
 <span id="L284" class="LineNr">284 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L285" class="LineNr">285 </span><span class="Normal">case</span> _WRITE_TO_SOCKET: <span class="Delimiter">{</span>
 <span id="L286" class="LineNr">286 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L287" class="LineNr">287 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$write-to-socket' requires exactly two ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L287" class="LineNr">287 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$write-to-socket' requires exactly two ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L288" class="LineNr">288 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L289" class="LineNr">289 </span>  <span class="Delimiter">}</span>
 <span id="L290" class="LineNr">290 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -357,7 +357,7 @@ if ('onhashchange' in window) {
 <span id="L297" class="LineNr">297 </span>  <span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span> y = <span class="Normal">static_cast</span>&lt;<span class="Normal">long</span> <span class="Normal">long</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L298" class="LineNr">298 </span>  <span class="Normal">char</span> c = <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span>y<span class="Delimiter">);</span>
 <span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>write<span class="Delimiter">(</span>socket<span class="Delimiter">-&gt;</span>fd<span class="Delimiter">,</span> &amp;c<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;failed to write to socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;failed to write to socket</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>    exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
 <span id="L303" class="LineNr">303 </span>  products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
@@ -372,19 +372,19 @@ if ('onhashchange' in window) {
 <span id="L312" class="LineNr">312 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L313" class="LineNr">313 </span><span class="Normal">case</span> _CLOSE_SOCKET: <span class="Delimiter">{</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L315" class="LineNr">315 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-socket' requires exactly two ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L315" class="LineNr">315 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-socket' requires exactly two ingredient, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L316" class="LineNr">316 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L317" class="LineNr">317 </span>  <span class="Delimiter">}</span>
 <span id="L318" class="LineNr">318 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_number<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$close-socket' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L319" class="LineNr">319 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of '$close-socket' should be a number, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L320" class="LineNr">320 </span>    <span class="Identifier">break</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="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L323" class="LineNr">323 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-socket' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L323" class="LineNr">323 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'$close-socket' requires exactly one product, but got '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L324" class="LineNr">324 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L325" class="LineNr">325 </span>  <span class="Delimiter">}</span>
 <span id="L326" class="LineNr">326 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name != inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr">327 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of '$close-socket' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L327" class="LineNr">327 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of '$close-socket' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L328" class="LineNr">328 </span>    <span class="Identifier">break</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">break</span><span class="Delimiter">;</span>
diff --git a/html/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index de36acf2..0310ff92 100644
--- a/html/099hardware_checks.cc.html
+++ b/html/099hardware_checks.cc.html
@@ -97,7 +97,7 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr">35 </span>  <span class="Normal">const</span> recipe&amp; caller = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">);</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name == <span class="Constant">&quot;main&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L37" class="LineNr">37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L77'>starts_with</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;scenario_&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L38" class="LineNr">38 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check if <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has any dependency-injection mistakes&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr">38 </span>  <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9991</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;--- check if <a href='010vm.cc.html#L19'>recipe</a> &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot; has any dependency-injection mistakes&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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> index = <span class="Constant">0</span><span class="Delimiter">;</span>  index &lt; <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>steps<span class="Delimiter">);</span>  ++index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L40" class="LineNr">40 </span>    <span class="Normal">const</span> instruction&amp; inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L41" class="LineNr">41 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='028call_return.cc.html#L115'>is_primitive</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>operation<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
@@ -110,7 +110,7 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr">48 </span>      <span class="Normal">const</span> reagent&amp; expected_ing = callee<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L49" class="LineNr">49 </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#L141'>SIZE</a><span class="Delimiter">(</span>Real_hardware_types<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L50" class="LineNr">50 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>*Real_hardware_types<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">)</span> == *expected_ing<span class="Delimiter">.</span>type<span class="Delimiter">)</span>
-<span id="L51" class="LineNr">51 </span>          <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': only 'main' can pass 0 into a &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>expected_ing<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L51" class="LineNr">51 </span>          <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': only 'main' can pass 0 into a &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>expected_ing<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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>
diff --git a/html/100trace_browser.cc.html b/html/100trace_browser.cc.html
index 80d6e158..54fbdef7 100644
--- a/html/100trace_browser.cc.html
+++ b/html/100trace_browser.cc.html
@@ -229,7 +229,7 @@ if ('onhashchange' in window) {
 <span id="L170" class="LineNr">170 </span>    <span class="Delimiter">}</span>
 <span id="L171" class="LineNr">171 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">'J'</span> || key == TB_KEY_PGDN || key == TB_KEY_CTRL_F<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L172" class="LineNr">172 </span>      <span class="Comment">// page-down</span>
-<span id="L173" class="LineNr">173 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_index<span class="Delimiter">.</span>find<span class="Delimiter">(</span>tb_height<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> != Trace_index<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_index<span class="Delimiter">.</span>find<span class="Delimiter">(</span>tb_height<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> != Trace_index<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
 <span id="L174" class="LineNr">174 </span>        Top_of_screen = get<span class="Delimiter">(</span>Trace_index<span class="Delimiter">,</span> tb_height<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> + <span class="Constant">1</span><span class="Delimiter">;</span>
 <span id="L175" class="LineNr">175 </span>        <a href='100trace_browser.cc.html#L402'>refresh_screen_rows</a><span class="Delimiter">();</span>
 <span id="L176" class="LineNr">176 </span>      <span class="Delimiter">}</span>
@@ -570,7 +570,7 @@ if ('onhashchange' in window) {
 <span id="L511" class="LineNr">511 </span>    tin &gt;&gt; depth<span class="Delimiter">;</span>
 <span id="L512" class="LineNr">512 </span>    string label<span class="Delimiter">;</span>
 <span id="L513" class="LineNr">513 </span>    tin &gt;&gt; label<span class="Delimiter">;</span>
-<span id="L514" class="LineNr">514 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*--label<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span> label<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>--label<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">());</span>
+<span id="L514" class="LineNr">514 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*--label<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span> label<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>--label<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span>
 <span id="L515" class="LineNr">515 </span>    string line<span class="Delimiter">;</span>
 <span id="L516" class="LineNr">516 </span>    getline<span class="Delimiter">(</span>tin<span class="Delimiter">,</span> line<span class="Delimiter">);</span>
 <span id="L517" class="LineNr">517 </span>    Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>depth<span class="Delimiter">,</span> label<span class="Delimiter">,</span> line<span class="Delimiter">));</span>
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index 0f456c62..97ebc1ff 100644
--- a/html/101run_sandboxed.cc.html
+++ b/html/101run_sandboxed.cc.html
@@ -106,11 +106,11 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L44" class="LineNr"> 44 </span><span class="Normal">case</span> RUN_SANDBOXED: <span class="Delimiter">{</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'run-sandboxed' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'run-sandboxed' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L48" class="LineNr"> 48 </span>  <span class="Delimiter">}</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'run-sandboxed' should be a string, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'run-sandboxed' should be a string, but got '&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">))</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><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 class="Identifier">break</span><span class="Delimiter">;</span>
@@ -167,7 +167,7 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">1</span><span class="Delimiter">;</span> i &lt; Reserved_for_tests<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span>
 <span id="L105" class="LineNr">105 </span>      Memory<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>  string command = <a href='003trace.cc.html#L395'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L494'>strip_comments</a><span class="Delimiter">(</span><a href='038new_text.cc.html#L142'>read_mu_text</a><span class="Delimiter">(</span><a href='043space.cc.html#L101'>address</a><span class="Delimiter">)));</span>
+<span id="L107" class="LineNr">107 </span>  string command = <a href='003trace.cc.html#L394'>trim</a><span class="Delimiter">(</span><a href='101run_sandboxed.cc.html#L494'>strip_comments</a><span class="Delimiter">(</span><a href='038new_text.cc.html#L142'>read_mu_text</a><span class="Delimiter">(</span><a href='043space.cc.html#L101'>address</a><span class="Delimiter">)));</span>
 <span id="L108" class="LineNr">108 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;command: &quot; &lt;&lt; command &lt;&lt; '\n';</span>
 <span id="L109" class="LineNr">109 </span>  Name[get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;interactive&quot;</span><span class="Delimiter">)</span>]<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span>
 <span id="L110" class="LineNr">110 </span>  <a href='101run_sandboxed.cc.html#L153'>run_code_begin</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">should_stash_snapshots</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span>
@@ -191,7 +191,7 @@ if ('onhashchange' in window) {
 <span id="L128" class="LineNr">128 </span>  <span class="Comment">// and wait for it</span>
 <span id="L129" class="LineNr">129 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace_stream<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L130" class="LineNr">130 </span>    ++Save_trace_stream<span class="Delimiter">-&gt;</span>callstack_depth<span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </span>    <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;run-sandboxed: incrementing callstack depth to &quot;</span> &lt;&lt; Save_trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>    <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">&quot;trace&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;run-sandboxed: incrementing callstack depth to &quot;</span> &lt;&lt; Save_trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L132" class="LineNr">132 </span>    assert<span class="Delimiter">(</span>Save_trace_stream<span class="Delimiter">-&gt;</span>callstack_depth &lt; <span class="Constant">9000</span><span class="Delimiter">);</span>  <span class="Comment">// 9998-101 plus cushion</span>
 <span id="L133" class="LineNr">133 </span>  <span class="Delimiter">}</span>
 <span id="L134" class="LineNr">134 </span>  Current_routine<span class="Delimiter">-&gt;</span>calls<span class="Delimiter">.</span>push_front<span class="Delimiter">(</span>call<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;sandbox&quot;</span><span class="Delimiter">)));</span>
@@ -578,10 +578,10 @@ if ('onhashchange' in window) {
 <span id="L515" class="LineNr">515 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L515'>trace_error_contents</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L516" class="LineNr">516 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L517" class="LineNr">517 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L518" class="LineNr">518 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L518" class="LineNr">518 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L519" class="LineNr">519 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>label != <span class="Constant">&quot;error&quot;</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L520" class="LineNr">520 </span>    out &lt;&lt; p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">;</span>
-<span id="L521" class="LineNr">521 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L521" class="LineNr">521 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L522" class="LineNr">522 </span>  <span class="Delimiter">}</span>
 <span id="L523" class="LineNr">523 </span>  string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L524" class="LineNr">524 </span>  <a href='101run_sandboxed.cc.html#L543'>truncate</a><span class="Delimiter">(</span>result<span class="Delimiter">);</span>
@@ -592,10 +592,10 @@ if ('onhashchange' in window) {
 <span id="L529" class="LineNr">529 </span><span class="Normal">int</span> <a href='101run_sandboxed.cc.html#L529'>trace_app_contents</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L530" class="LineNr">530 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L531" class="LineNr">531 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L532" class="LineNr">532 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L532" class="LineNr">532 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-&gt;</span>past_lines<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L533" class="LineNr">533 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>depth != App_depth<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
 <span id="L534" class="LineNr">534 </span>    out &lt;&lt; p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">;</span>
-<span id="L535" class="LineNr">535 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L535" class="LineNr">535 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>*--p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> out &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L536" class="LineNr">536 </span>  <span class="Delimiter">}</span>
 <span id="L537" class="LineNr">537 </span>  string result = out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L538" class="LineNr">538 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
@@ -622,11 +622,11 @@ if ('onhashchange' in window) {
 <span id="L559" class="LineNr">559 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Checks&quot;)</span>
 <span id="L560" class="LineNr">560 </span><span class="Normal">case</span> RELOAD: <span class="Delimiter">{</span>
 <span id="L561" class="LineNr">561 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">)</span> != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L562" class="LineNr">562 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'reload' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L562" class="LineNr">562 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'reload' requires exactly one ingredient, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L563" class="LineNr">563 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L564" class="LineNr">564 </span>  <span class="Delimiter">}</span>
 <span id="L565" class="LineNr">565 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_mu_text<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span>
-<span id="L566" class="LineNr">566 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'reload' should be a string, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L566" class="LineNr">566 </span>    <a href='003trace.cc.html#L196'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;first ingredient of 'reload' should be a string, but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span>
 <span id="L567" class="LineNr">567 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L568" class="LineNr">568 </span>  <span class="Delimiter">}</span>
 <span id="L569" class="LineNr">569 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index 63ed444d..5b9dbf8d 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -123,7 +123,7 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;SubX uses a subset of the x86 instruction set. SubX programs will <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;without modification on Linux computers.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;It provides a better experience and better error messages than</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;programming directly in machine <a href='031check_operands.cc.html#L14'>code</a>, but you have to stick to the</span><span class="cSpecial">\n</span><span class="Constant">&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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;instructions it supports.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;== Ways to invoke subx</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -136,7 +136,7 @@ if ('onhashchange' in window) {
 <span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;    subx translate input1.subx intput2.subx ... -o &lt;output ELF binary&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;- Run a SubX binary using SubX itself (for better error messages):</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;    subx <a href='011run.cc.html#L83'>run</a> &lt;ELF binary&gt;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;Add '--trace' to any of these commands to also emit a <a href='003trace.cc.html#L204'>trace</a>, for debugging purposes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;Add '--trace' to any of these commands to also emit a <a href='003trace.cc.html#L203'>trace</a>, for debugging purposes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;However, options starting with '--' must always come before any other arguments.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Constant">&quot;To start learning how to write SubX programs, <a href='011run.cc.html#L83'>run</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -310,36 +310,41 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr">250 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type&amp; <a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L251" class="LineNr">251 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
 <span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
-<span id="L253" class="LineNr">253 </span><span class="Comment">//: The contract: any container that relies on get_or_insert should never call</span>
-<span id="L254" class="LineNr">254 </span><span class="Comment">//: contains_key.</span>
-<span id="L255" class="LineNr">255 </span>
-<span id="L256" class="LineNr">256 </span><span class="Comment">//: 7. istreams are a royal pain in the arse. You have to be careful about</span>
-<span id="L257" class="LineNr">257 </span><span class="Comment">//: what subclass you try to putback into. You have to watch out for the pesky</span>
-<span id="L258" class="LineNr">258 </span><span class="Comment">//: failbit and badbit. Just avoid eof() and use this helper instead.</span>
-<span id="L259" class="LineNr">259 </span><span class="Delimiter">:(code)</span>
-<span id="L260" class="LineNr">260 </span><span class="Normal">bool</span> <a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Identifier">return</span> in &amp;&amp; !in<span class="Delimiter">.</span>eof<span class="Delimiter">();</span>
-<span id="L262" class="LineNr">262 </span><span class="Delimiter">}</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L265" class="LineNr">265 </span><span class="Comment">#include &lt;assert.h&gt;</span>
-<span id="L266" class="LineNr">266 </span>
-<span id="L267" class="LineNr">267 </span><span class="Comment">#include &lt;iostream&gt;</span>
-<span id="L268" class="LineNr">268 </span><span class="Normal">using</span> std::istream<span class="Delimiter">;</span>
-<span id="L269" class="LineNr">269 </span><span class="Normal">using</span> std::ostream<span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </span><span class="Normal">using</span> std::iostream<span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </span><span class="Normal">using</span> std::cin<span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span><span class="Normal">using</span> std::cout<span class="Delimiter">;</span>
-<span id="L273" class="LineNr">273 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
-<span id="L274" class="LineNr">274 </span><span class="Comment">#include &lt;iomanip&gt;</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="Comment">#include &lt;string.h&gt;</span>
-<span id="L277" class="LineNr">277 </span><span class="Comment">#include &lt;string&gt;</span>
-<span id="L278" class="LineNr">278 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Comment">#include &lt;algorithm&gt;</span>
-<span id="L281" class="LineNr">281 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
+<span id="L253" class="LineNr">253 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; <a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span>T&amp; map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>&amp; key<span class="Delimiter">,</span> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; value<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L254" class="LineNr">254 </span>  assert<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> == map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L255" class="LineNr">255 </span>  map[key] = value<span class="Delimiter">;</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
+<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
+<span id="L258" class="LineNr">258 </span><span class="Comment">//: The contract: any container that relies on get_or_insert should never call</span>
+<span id="L259" class="LineNr">259 </span><span class="Comment">//: contains_key.</span>
+<span id="L260" class="LineNr">260 </span>
+<span id="L261" class="LineNr">261 </span><span class="Comment">//: 7. istreams are a royal pain in the arse. You have to be careful about</span>
+<span id="L262" class="LineNr">262 </span><span class="Comment">//: what subclass you try to putback into. You have to watch out for the pesky</span>
+<span id="L263" class="LineNr">263 </span><span class="Comment">//: failbit and badbit. Just avoid eof() and use this helper instead.</span>
+<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(code)</span>
+<span id="L265" class="LineNr">265 </span><span class="Normal">bool</span> <a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Identifier">return</span> in &amp;&amp; !in<span class="Delimiter">.</span>eof<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="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L270" class="LineNr">270 </span><span class="Comment">#include &lt;assert.h&gt;</span>
+<span id="L271" class="LineNr">271 </span>
+<span id="L272" class="LineNr">272 </span><span class="Comment">#include &lt;iostream&gt;</span>
+<span id="L273" class="LineNr">273 </span><span class="Normal">using</span> std::istream<span class="Delimiter">;</span>
+<span id="L274" class="LineNr">274 </span><span class="Normal">using</span> std::ostream<span class="Delimiter">;</span>
+<span id="L275" class="LineNr">275 </span><span class="Normal">using</span> std::iostream<span class="Delimiter">;</span>
+<span id="L276" class="LineNr">276 </span><span class="Normal">using</span> std::cin<span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span><span class="Normal">using</span> std::cout<span class="Delimiter">;</span>
+<span id="L278" class="LineNr">278 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
+<span id="L279" class="LineNr">279 </span><span class="Comment">#include &lt;iomanip&gt;</span>
+<span id="L280" class="LineNr">280 </span>
+<span id="L281" class="LineNr">281 </span><span class="Comment">#include &lt;string.h&gt;</span>
+<span id="L282" class="LineNr">282 </span><span class="Comment">#include &lt;string&gt;</span>
+<span id="L283" class="LineNr">283 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span>
+<span id="L285" class="LineNr">285 </span><span class="Comment">#include &lt;algorithm&gt;</span>
+<span id="L286" class="LineNr">286 </span><span class="Normal">using</span> std::min<span class="Delimiter">;</span>
+<span id="L287" class="LineNr">287 </span><span class="Normal">using</span> std::max<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index fb544db8..8f4b68e1 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -139,20 +139,20 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span><span class="Comment">//: Traces can have a lot of overhead, so only turn them on when asked.</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>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="L83" class="LineNr"> 83 </span>  <a href='003trace.cc.html#L238'>Save_trace</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>  <a href='003trace.cc.html#L237'>Save_trace</a> =<span class="Constant"> true</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">:(before &quot;End Commandline Parsing&quot;)</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L87" class="LineNr"> 87 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing <a href='003trace.cc.html#L204'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L88" class="LineNr"> 88 </span>  <a href='003trace.cc.html#L175'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L237'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L87" class="LineNr"> 87 </span>  cerr &lt;&lt; <span class="Constant">&quot;initializing <a href='003trace.cc.html#L203'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>  <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(code)</span>
 <span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> <a href='003trace.cc.html#L91'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>Save_trace</a><span class="Delimiter">)</span>
-<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span>  <a href='003trace.cc.html#L175'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L237'>Save_trace</a><span class="Delimiter">)</span>
+<span id="L94" class="LineNr"> 94 </span>    <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">;</span>
+<span id="L96" class="LineNr"> 96 </span>  <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span>
 <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
 <span id="L99" class="LineNr"> 99 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L91'>cleanup_main</a><span class="Delimiter">);</span>
@@ -190,7 +190,7 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>
 <span id="L133" class="LineNr">133 </span>  <span class="Normal">void</span> <a href='003trace.cc.html#L133'>save</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L204'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>    cerr &lt;&lt; <span class="Constant">&quot;saving <a href='003trace.cc.html#L203'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L135" class="LineNr">135 </span>    ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_run&quot;</span><span class="Delimiter">);</span>
 <span id="L136" class="LineNr">136 </span>    fout &lt;&lt; <a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L137" class="LineNr">137 </span>    fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
@@ -207,11 +207,11 @@ if ('onhashchange' in window) {
 <span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span>  string curr_contents = <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
 <span id="L150" class="LineNr">150 </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="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
+<span id="L151" class="LineNr">151 </span>    <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span>  <span class="Comment">// preserve indent in contents</span>
 <span id="L152" class="LineNr">152 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors &amp;&amp; <a href='003trace.cc.html#L114'>curr_depth</a> == <a href='003trace.cc.html#L106'>Error_depth</a><span class="Delimiter">)</span>
 <span id="L153" class="LineNr">153 </span>        || <span class="Delimiter">(</span>!Hide_warnings &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L114'>curr_depth</a> == <a href='003trace.cc.html#L107'>Warn_depth</a><span class="Delimiter">)</span>
-<span id="L154" class="LineNr">154 </span>        || <a href='003trace.cc.html#L189'>Dump_trace</a>
-<span id="L155" class="LineNr">155 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L113'>curr_label</a> == <a href='003trace.cc.html#L190'>Dump_label</a><span class="Delimiter">))</span>
+<span id="L154" class="LineNr">154 </span>        || <a href='003trace.cc.html#L188'>Dump_trace</a>
+<span id="L155" class="LineNr">155 </span>        || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> &amp;&amp; <a href='003trace.cc.html#L113'>curr_label</a> == <a href='003trace.cc.html#L189'>Dump_label</a><span class="Delimiter">))</span>
 <span id="L156" class="LineNr">156 </span>      cerr &lt;&lt; <a href='003trace.cc.html#L113'>curr_label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; curr_contents &lt;&lt; <span class="cSpecial">'\n'</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="Normal">delete</span> <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span>
@@ -222,267 +222,266 @@ if ('onhashchange' in window) {
 <span id="L163" class="LineNr">163 </span>
 <span id="L164" class="LineNr">164 </span>string trace_stream::<a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L165" class="LineNr">165 </span>  ostringstream output<span class="Delimiter">;</span>
-<span id="L166" class="LineNr">166 </span>  label = <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L166" class="LineNr">166 </span>  label = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L167" class="LineNr">167 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L168" class="LineNr">168 </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 class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </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="L169" class="LineNr">169 </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#L72'>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#L74'>contents</a> &lt;&lt; <span class="cSpecial">'\n'</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="Identifier">return</span> output<span class="Delimiter">.</span>str<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="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L175" class="LineNr">175 </span>trace_stream* <a href='003trace.cc.html#L175'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L176" class="LineNr">176 </span><span class="Normal">int</span> <a href='003trace.cc.html#L176'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Comment">//: option to print trace to the screen</span>
-<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L180" class="LineNr">180 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L180'>Flag_dump_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
-<span id="L182" class="LineNr">182 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>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="L183" class="LineNr">183 </span>  <a href='003trace.cc.html#L180'>Flag_dump_trace</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L184" class="LineNr">184 </span><span class="Delimiter">}</span>
-<span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L187" class="LineNr">187 </span><span class="Normal">bool</span> Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print even error trace lines to screen</span>
-<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> Hide_warnings =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print warnings to screen</span>
-<span id="L189" class="LineNr">189 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L189'>Dump_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines to screen</span>
-<span id="L190" class="LineNr">190 </span>string <a href='003trace.cc.html#L190'>Dump_label</a> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines matching a single label to screen</span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L192" class="LineNr">192 </span>Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L193" class="LineNr">193 </span>Hide_warnings =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span><a href='003trace.cc.html#L189'>Dump_trace</a> = <a href='003trace.cc.html#L180'>Flag_dump_trace</a><span class="Delimiter">;</span>
-<span id="L195" class="LineNr">195 </span><a href='003trace.cc.html#L190'>Dump_label</a> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L196" class="LineNr">196 </span><span class="Comment">//: Never dump warnings in scenarios</span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L198" class="LineNr">198 </span>Hide_warnings =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L201" class="LineNr">201 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
-<span id="L202" class="LineNr">202 </span>
-<span id="L203" class="LineNr">203 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
-<span id="L204" class="LineNr">204 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
-<span id="L205" class="LineNr">205 </span>
-<span id="L206" class="LineNr">206 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
-<span id="L207" class="LineNr">207 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
-<span id="L208" class="LineNr">208 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
-<span id="L209" class="LineNr">209 </span>
-<span id="L210" class="LineNr">210 </span><span class="Comment">// Errors and warnings are special layers.</span>
-<span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </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="L213" class="LineNr">213 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
-<span id="L214" class="LineNr">214 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment">#define assert_for_now assert</span>
-<span id="L216" class="LineNr">216 </span><span class="Comment">#define raise_for_now raise</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
-<span id="L219" class="LineNr">219 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
-<span id="L221" class="LineNr">221 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L222" class="LineNr">222 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</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="Delimiter">:(code)</span>
-<span id="L225" class="LineNr">225 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Identifier">return</span> <a href='003trace.cc.html#L176'>Trace_errors</a> &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="L227" class="LineNr">227 </span><span class="Delimiter">}</span>
-<span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L230" class="LineNr">230 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
-<span id="L231" class="LineNr">231 </span><span class="Delimiter">:(code)</span>
-<span id="L232" class="LineNr">232 </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="L233" class="LineNr">233 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L238" class="LineNr">238 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L238'>Save_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L242" class="LineNr">242 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>  lease_tracer<span class="Delimiter">();</span>
-<span id="L244" class="LineNr">244 </span>  <a href='003trace.cc.html#L248'>~lease_tracer</a><span class="Delimiter">();</span>
-<span id="L245" class="LineNr">245 </span><span class="Delimiter">};</span>
-<span id="L246" class="LineNr">246 </span><span class="Delimiter">:(code)</span>
-<span id="L247" class="LineNr">247 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L175'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
-<span id="L248" class="LineNr">248 </span>lease_tracer::<a href='003trace.cc.html#L248'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L238'>Save_trace</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L175'>Trace_stream</a> = <span class="Constant">NULL</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="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L253" class="LineNr">253 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
-<span id="L255" class="LineNr">255 </span><a href='003trace.cc.html#L253'>START_TRACING_UNTIL_END_OF_SCOPE</a>
-<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_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
-<span id="L261" class="LineNr">261 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; <a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
-<span id="L263" class="LineNr">263 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span> \
-<span id="L264" class="LineNr">264 </span>    <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
-<span id="L265" class="LineNr">265 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><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>
-<span id="L269" class="LineNr">269 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &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="L271" class="LineNr">271 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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="L272" class="LineNr">272 </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="L273" class="LineNr">273 </span>    <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
-<span id="L274" class="LineNr">274 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
-<span id="L275" class="LineNr">275 </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="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="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
-<span id="L279" class="LineNr">279 </span>
-<span id="L280" class="LineNr">280 </span><span class="Delimiter">:(code)</span>
-<span id="L281" class="LineNr">281 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L281'>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="L282" class="LineNr">282 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span>  vector&lt;string&gt; expected_lines = <a href='003trace.cc.html#L375'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L157'>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="L287" class="LineNr">287 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>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="L289" class="LineNr">289 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
-<span id="L290" class="LineNr">290 </span>  <a href='003trace.cc.html#L313'>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="L291" class="LineNr">291 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L292" class="LineNr">292 </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="L293" class="LineNr">293 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span>    ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L157'>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="L296" class="LineNr">296 </span>      ++curr_expected_line<span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>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="L298" class="LineNr">298 </span>    <a href='003trace.cc.html#L313'>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="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">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L326'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L302" class="LineNr">302 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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#L117'>line</a> [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L204'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr">303 </span>    <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">}</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L306" class="LineNr">306 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L204'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>    <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Delimiter">}</span>
-<span id="L309" class="LineNr">309 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L310" class="LineNr">310 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Normal">void</span> <a href='003trace.cc.html#L313'>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#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L314" class="LineNr">314 </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="L315" class="LineNr">315 </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="L316" class="LineNr">316 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L318" class="LineNr">318 </span>    *contents = <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
-<span id="L319" class="LineNr">319 </span>  <span class="Delimiter">}</span>
-<span id="L320" class="LineNr">320 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L321" class="LineNr">321 </span>    *label = <a href='003trace.cc.html#L399'>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="L322" class="LineNr">322 </span>    *contents = <a href='003trace.cc.html#L399'>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="L323" class="LineNr">323 </span>  <span class="Delimiter">}</span>
-<span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
-<span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L326'>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#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr">327 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L328" class="LineNr">328 </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="L329" class="LineNr">329 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</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">return</span><span class="Constant"> false</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="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </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="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="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L341" class="LineNr">341 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L342" class="LineNr">342 </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="L343" class="LineNr">343 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span>
-<span id="L344" class="LineNr">344 </span>        ++result<span class="Delimiter">;</span>
-<span id="L345" class="LineNr">345 </span>    <span class="Delimiter">}</span>
-<span id="L346" class="LineNr">346 </span>  <span class="Delimiter">}</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Identifier">return</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 id="L350" class="LineNr">350 </span><span class="Normal">int</span> <a href='003trace.cc.html#L350'>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="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L354" class="LineNr">354 </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="L355" class="LineNr">355 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
-<span id="L356" class="LineNr">356 </span>        ++result<span class="Delimiter">;</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 class="Identifier">return</span> result<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="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</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> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L367" class="LineNr">367 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L390'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>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="L369" class="LineNr">369 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L204'>trace</a> <a href='011run.cc.html#L117'>line</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L370" class="LineNr">370 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Delimiter">}</span>
-<span id="L372" class="LineNr">372 </span>  <span class="Identifier">return</span> trace_doesnt_contain<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 id="L373" class="LineNr">373 </span><span class="Delimiter">}</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span>vector&lt;string&gt; <a href='003trace.cc.html#L375'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L376" class="LineNr">376 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L377" class="LineNr">377 </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="L378" class="LineNr">378 </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="L379" class="LineNr">379 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L380" class="LineNr">380 </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="L381" class="LineNr">381 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L382" class="LineNr">382 </span>    <span class="Delimiter">}</span>
-<span id="L383" class="LineNr">383 </span>    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="L384" class="LineNr">384 </span>    begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
-<span id="L385" class="LineNr">385 </span>    end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<span class="Delimiter">);</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Delimiter">}</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Identifier">return</span> result<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>vector&lt;string&gt; <a href='003trace.cc.html#L390'>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="L391" class="LineNr">391 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
-<span id="L392" class="LineNr">392 </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="L393" class="LineNr">393 </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="L394" class="LineNr">394 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span>
-<span id="L395" class="LineNr">395 </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="L396" class="LineNr">396 </span>  <span class="Identifier">return</span> result<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>string <a href='003trace.cc.html#L399'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L400" class="LineNr">400 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
-<span id="L401" class="LineNr">401 </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="L402" class="LineNr">402 </span>    ++first<span class="Delimiter">;</span>
-<span id="L403" class="LineNr">403 </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="L404" class="LineNr">404 </span>
-<span id="L405" class="LineNr">405 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </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="L407" class="LineNr">407 </span>    --last<span class="Delimiter">;</span>
-<span id="L408" class="LineNr">408 </span>  ++last<span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
-<span id="L410" class="LineNr">410 </span><span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L413" class="LineNr">413 </span><span class="Comment">#include &lt;vector&gt;</span>
-<span id="L414" class="LineNr">414 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
-<span id="L415" class="LineNr">415 </span><span class="Comment">#include &lt;list&gt;</span>
-<span id="L416" class="LineNr">416 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span><span class="Comment">#include &lt;set&gt;</span>
-<span id="L418" class="LineNr">418 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
-<span id="L419" class="LineNr">419 </span>
-<span id="L420" class="LineNr">420 </span><span class="Comment">#include &lt;sstream&gt;</span>
-<span id="L421" class="LineNr">421 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
-<span id="L422" class="LineNr">422 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
-<span id="L423" class="LineNr">423 </span>
-<span id="L424" class="LineNr">424 </span><span class="Comment">#include &lt;fstream&gt;</span>
-<span id="L425" class="LineNr">425 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
-<span id="L426" class="LineNr">426 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">}</span>
+<span id="L172" class="LineNr">172 </span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L174" class="LineNr">174 </span>trace_stream* <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span><span class="Normal">int</span> <a href='003trace.cc.html#L175'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// used only when Trace_stream is NULL</span>
+<span id="L176" class="LineNr">176 </span>
+<span id="L177" class="LineNr">177 </span><span class="Comment">//: option to print trace to the screen</span>
+<span id="L178" class="LineNr">178 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L179'>Flag_dump_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before &quot;End Commandline Options(*arg)&quot;)</span>
+<span id="L181" class="LineNr">181 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>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="L182" class="LineNr">182 </span>  <a href='003trace.cc.html#L179'>Flag_dump_trace</a> =<span class="Constant"> true</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> Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print even error trace lines to screen</span>
+<span id="L187" class="LineNr">187 </span><span class="Normal">bool</span> Hide_warnings =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, don't print warnings to screen</span>
+<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L188'>Dump_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines to screen</span>
+<span id="L189" class="LineNr">189 </span>string <a href='003trace.cc.html#L189'>Dump_label</a> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// if set, print trace lines matching a single label to screen</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L191" class="LineNr">191 </span>Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L192" class="LineNr">192 </span>Hide_warnings =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span><a href='003trace.cc.html#L188'>Dump_trace</a> = <a href='003trace.cc.html#L179'>Flag_dump_trace</a><span class="Delimiter">;</span>
+<span id="L194" class="LineNr">194 </span><a href='003trace.cc.html#L189'>Dump_label</a> = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L195" class="LineNr">195 </span><span class="Comment">//: Never dump warnings in scenarios</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L197" class="LineNr">197 </span>Hide_warnings =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L200" class="LineNr">200 </span><span class="Comment">#define CLEAR_TRACE  delete Trace_stream, Trace_stream = new trace_stream;</span>
+<span id="L201" class="LineNr">201 </span>
+<span id="L202" class="LineNr">202 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
+<span id="L203" class="LineNr">203 </span><span class="Comment">#define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream-&gt;stream(__VA_ARGS__)</span>
+<span id="L204" class="LineNr">204 </span>
+<span id="L205" class="LineNr">205 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
+<span id="L206" class="LineNr">206 </span><span class="Comment">#define dbg trace(0, &quot;a&quot;)</span>
+<span id="L207" class="LineNr">207 </span><span class="Comment">#define DUMP(label)  if (Trace_stream) cerr &lt;&lt; Trace_stream-&gt;readable_contents(label);</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="Comment">// Errors and warnings are special layers.</span>
+<span id="L210" class="LineNr">210 </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="L211" class="LineNr">211 </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="L212" class="LineNr">212 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L213" class="LineNr">213 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L214" class="LineNr">214 </span><span class="Comment">#define assert_for_now assert</span>
+<span id="L215" class="LineNr">215 </span><span class="Comment">#define raise_for_now raise</span>
+<span id="L216" class="LineNr">216 </span>
+<span id="L217" class="LineNr">217 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
+<span id="L218" class="LineNr">218 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
+<span id="L219" class="LineNr">219 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L220" class="LineNr">220 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; !Hide_errors &amp;&amp; <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L221" class="LineNr">221 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">}</span>
+<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(code)</span>
+<span id="L224" class="LineNr">224 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Identifier">return</span> <a href='003trace.cc.html#L175'>Trace_errors</a> &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="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="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L229" class="LineNr">229 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(code)</span>
+<span id="L231" class="LineNr">231 </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="L232" class="LineNr">232 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Identifier">return</span> os<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">:(before &quot;End Globals&quot;)</span>
+<span id="L237" class="LineNr">237 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L237'>Save_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// if set, write out trace to disk</span>
+<span id="L238" class="LineNr">238 </span>
+<span id="L239" class="LineNr">239 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L241" class="LineNr">241 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L242" class="LineNr">242 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L247'>~lease_tracer</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span><span class="Delimiter">};</span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(code)</span>
+<span id="L246" class="LineNr">246 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span>lease_tracer::<a href='003trace.cc.html#L247'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L237'>Save_trace</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Normal">delete</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L250" class="LineNr">250 </span><span class="Delimiter">}</span>
+<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L252" class="LineNr">252 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer;</span>
+<span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L254" class="LineNr">254 </span><a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L257" class="LineNr">257 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...)  check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L260" class="LineNr">260 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &amp;&amp; <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \
+<span id="L262" class="LineNr">262 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span> \
+<span id="L263" class="LineNr">263 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;error&quot;</span><span class="Delimiter">);</span> \
+<span id="L264" class="LineNr">264 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L265" class="LineNr">265 </span>    <span class="Identifier">return</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="Comment">#define CHECK_TRACE_COUNT(label, count) \</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> &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="L270" class="LineNr">270 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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="L271" class="LineNr">271 </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="L272" class="LineNr">272 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \
+<span id="L273" class="LineNr">273 </span>    <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \
+<span id="L274" class="LineNr">274 </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="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="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L278" class="LineNr">278 </span>
+<span id="L279" class="LineNr">279 </span><span class="Delimiter">:(code)</span>
+<span id="L280" class="LineNr">280 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L280'>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="L281" class="LineNr">281 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L157'>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="L286" class="LineNr">286 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>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="L288" class="LineNr">288 </span>  string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L312'>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="L290" class="LineNr">290 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L291" class="LineNr">291 </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="L292" class="LineNr">292 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span>    ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; <a href='001help.cc.html#L157'>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="L295" class="LineNr">295 </span>      ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>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="L297" class="LineNr">297 </span>    <a href='003trace.cc.html#L312'>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="L298" class="LineNr">298 </span>  <span class="Delimiter">}</span>
+<span id="L299" class="LineNr">299 </span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L325'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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#L117'>line</a> [&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L203'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Delimiter">}</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L305" class="LineNr">305 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &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#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] in <a href='003trace.cc.html#L203'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Delimiter">}</span>
+<span id="L308" class="LineNr">308 </span>  <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Normal">void</span> <a href='003trace.cc.html#L312'>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#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </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="L314" class="LineNr">314 </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="L315" class="LineNr">315 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>    *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L317" class="LineNr">317 </span>    *contents = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L318" class="LineNr">318 </span>  <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L320" class="LineNr">320 </span>    *label = <a href='003trace.cc.html#L398'>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="L321" class="LineNr">321 </span>    *contents = <a href='003trace.cc.html#L398'>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="L322" class="LineNr">322 </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">bool</span> <a href='003trace.cc.html#L325'>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#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</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><span class="Constant"> false</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#L117'>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>!Trace_stream<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 = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>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#L117'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>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>!Trace_stream<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 = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>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#L93'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L398'>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">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</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="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L366" class="LineNr">366 </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="L367" class="LineNr">367 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>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="L368" class="LineNr">368 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing label or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L203'>trace</a> <a href='011run.cc.html#L117'>line</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L369" class="LineNr">369 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</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> trace_doesnt_contain<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 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>string <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L399" class="LineNr">399 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L400" class="LineNr">400 </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="L401" class="LineNr">401 </span>    ++first<span class="Delimiter">;</span>
+<span id="L402" class="LineNr">402 </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="L403" class="LineNr">403 </span>
+<span id="L404" class="LineNr">404 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L405" class="LineNr">405 </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="L406" class="LineNr">406 </span>    --last<span class="Delimiter">;</span>
+<span id="L407" class="LineNr">407 </span>  ++last<span class="Delimiter">;</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<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="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L412" class="LineNr">412 </span><span class="Comment">#include &lt;vector&gt;</span>
+<span id="L413" class="LineNr">413 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L414" class="LineNr">414 </span><span class="Comment">#include &lt;list&gt;</span>
+<span id="L415" class="LineNr">415 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span><span class="Comment">#include &lt;set&gt;</span>
+<span id="L417" class="LineNr">417 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Comment">#include &lt;sstream&gt;</span>
+<span id="L420" class="LineNr">420 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L421" class="LineNr">421 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L422" class="LineNr">422 </span>
+<span id="L423" class="LineNr">423 </span><span class="Comment">#include &lt;fstream&gt;</span>
+<span id="L424" class="LineNr">424 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L425" class="LineNr">425 </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 9a2d980c..e6e3689c 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -57,66 +57,66 @@ if ('onhashchange' in window) {
 <body onload='JumpToLine();'>
 <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#L204'>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#L203'>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#L257'>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#L204'>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#L204'>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#L278'>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#L203'>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#L203'>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#L257'>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#L277'>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#L204'>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#L203'>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#L204'>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#L204'>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#L203'>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#L203'>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#L257'>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#L204'>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#L204'>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#L203'>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#L203'>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#L257'>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#L204'>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</span><span class="cSpecial">\n</span><span class="Constant">&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#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>  <a href='003trace.cc.html#L257'>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#L204'>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#L203'>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#L257'>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#L204'>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#L204'>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#L204'>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="L42" class="LineNr"> 42 </span>  <a href='003trace.cc.html#L203'>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#L203'>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#L203'>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#L257'>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#L204'>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#L204'>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="L49" class="LineNr"> 49 </span>  <a href='003trace.cc.html#L203'>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#L203'>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#L204'>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#L204'>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="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L203'>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#L203'>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#L204'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&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>
@@ -133,26 +133,26 @@ if ('onhashchange' in window) {
 <span id="L75" class="LineNr"> 75 </span><span class="Comment">// can't check trace because trace methods call 'split'</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#L375'>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="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#L375'>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="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#L375'>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="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#L375'>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="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>
@@ -160,7 +160,7 @@ if ('onhashchange' in window) {
 <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#L375'>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="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>
@@ -168,19 +168,19 @@ if ('onhashchange' in window) {
 <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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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#L399'>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="L113" class="LineNr">113 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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#L398'>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>
 </pre>
 </body>
diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html
index ad6efb36..b48e3f87 100644
--- a/html/subx/010---vm.cc.html
+++ b/html/subx/010---vm.cc.html
@@ -18,7 +18,6 @@ a:hover { text-decoration: underline; }
 .cSpecial { color: #008000; }
 .LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.CommentedCode { color: #6c6c6c; }
 .Delimiter { color: #800080; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
@@ -95,341 +94,376 @@ if ('onhashchange' in window) {
 <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;  registers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L37" class="LineNr"> 37 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;registers&quot;</span><span class="Delimiter">,</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Constant">&quot;SubX currently supports eight 32-bit integer registers: R0 to R7.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Constant">&quot;R4 (ESP) contains the top of the stack.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Constant">&quot;There's also a register for the address of the currently executing</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Constant">&quot;instruction. It is modified by jumps.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Constant">&quot;Various instructions modify one or more of three 1-bit 'flag' registers,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Constant">&quot;as a side-effect:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Constant">&quot;- the sign flag (SF): usually set if an arithmetic result is negative, or</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Constant">&quot;  <a href='000organization.cc.html#L148'>reset</a> if not.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Constant">&quot;- the zero flag (ZF): usually set if a result is zero, or <a href='000organization.cc.html#L148'>reset</a> if not.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Constant">&quot;- the overflow flag (OF): usually set if an arithmetic result overflows.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Constant">&quot;The flag bits are read by conditional jumps.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Constant">&quot;We don't support non-integer (floating-point) registers yet.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</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">:(before &quot;End Globals&quot;)</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment">// the subset of x86 flag registers we care about</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Normal">bool</span> SF =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// sign flag</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Normal">bool</span> ZF =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// zero flag</span>
-<span id="L59" class="LineNr"> 59 </span><span class="Normal">bool</span> <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// overflow flag</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L61" class="LineNr"> 61 </span>SF = ZF = <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L62" class="LineNr"> 62 </span>
-<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: how the flag registers are updated after each instruction</span>
-<span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Comment">// Combine 'arg1' and 'arg2' with arithmetic operation 'op' and store the</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Comment">// result in 'arg1', then update flags.</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment">// beware: no side-effects in args</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment">#define BINARY_ARITHMETIC_OP(op, arg1, arg2) { \</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span> \
-<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">int64_t</span> tmp = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L72" class="LineNr"> 72 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L73" class="LineNr"> 73 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
-<span id="L74" class="LineNr"> 74 </span>  SF = <span class="Delimiter">(</span>arg1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span> \
-<span id="L75" class="LineNr"> 75 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
-<span id="L76" class="LineNr"> 76 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>arg1 != tmp<span class="Delimiter">);</span> \
-<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">}</span>
-<span id="L78" class="LineNr"> 78 </span>
-<span id="L79" class="LineNr"> 79 </span><span class="Comment">// Combine 'arg1' and 'arg2' with bitwise operation 'op' and store the result</span>
-<span id="L80" class="LineNr"> 80 </span><span class="Comment">// in 'arg1', then update flags.</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Comment">#define BINARY_BITWISE_OP(op, arg1, arg2) { \</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span> \
-<span id="L83" class="LineNr"> 83 </span>  arg1 = arg1 op arg2<span class="Delimiter">;</span> \
-<span id="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg1 &lt;&lt; end<span class="Delimiter">();</span> \
-<span id="L85" class="LineNr"> 85 </span>  SF = <span class="Delimiter">(</span>arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span> \
-<span id="L86" class="LineNr"> 86 </span>  ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \
-<span id="L87" class="LineNr"> 87 </span>  <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><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><span class="SalientComment">//:: simulated RAM</span>
-<span id="L91" class="LineNr"> 91 </span>
-<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L93'>INITIAL_SEGMENT_SIZE</a> = <span class="Constant">0x1000</span> - <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Comment">// Subtract one just so we can start the first segment at address 1 without</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Comment">// overflowing the first segment. Other segments will learn to adjust.</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Comment">// Like in real-world Linux, we'll allocate RAM for our programs in disjoint</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Comment">// slabs called VMAs or Virtual Memory Areas.</span>
-<span id="L99" class="LineNr"> 99 </span><span class="Normal">struct</span> vma <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">uint32_t</span> start<span class="Delimiter">;</span>  <span class="Comment">// inclusive</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Normal">uint32_t</span> end<span class="Delimiter">;</span>  <span class="Comment">// exclusive</span>
-<span id="L102" class="LineNr">102 </span>  vector&lt;<span class="Normal">uint8_t</span>&gt; <a href='010---vm.cc.html#L102'>_data</a><span class="Delimiter">;</span>
-<span id="L103" class="LineNr">103 </span>  vma<span class="Delimiter">(</span><span class="Normal">uint32_t</span> s<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e<span class="Delimiter">)</span> :start<span class="Delimiter">(</span>s<span class="Delimiter">),</span> end<span class="Delimiter">(</span>e<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>    <a href='010---vm.cc.html#L102'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Delimiter">}</span>
-<span id="L106" class="LineNr">106 </span>  vma<span class="Delimiter">(</span><span class="Normal">uint32_t</span> s<span class="Delimiter">)</span> :start<span class="Delimiter">(</span>s<span class="Delimiter">),</span> end<span class="Delimiter">(</span>s+INITIAL_SEGMENT_SIZE<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>    <a href='010---vm.cc.html#L102'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Delimiter">}</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">bool</span> <a href='010---vm.cc.html#L109'>match</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Identifier">return</span> a &gt;= start &amp;&amp; a &lt; end<span class="Delimiter">;</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Delimiter">}</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Normal">bool</span> <a href='010---vm.cc.html#L112'>match32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Identifier">return</span> a &gt;= start &amp;&amp; a+<span class="Constant">4</span> &lt;= end<span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">uint8_t</span>&amp; data<span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>    assert<span class="Delimiter">(</span><a href='010---vm.cc.html#L109'>match</a><span class="Delimiter">(</span>a<span class="Delimiter">));</span>
-<span id="L117" class="LineNr">117 </span>    <span class="Identifier">return</span> <a href='010---vm.cc.html#L102'>_data</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>a-start<span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Delimiter">}</span>
-<span id="L119" class="LineNr">119 </span>  <span class="Normal">void</span> <a href='010---vm.cc.html#L119'>grow_until</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L120" class="LineNr">120 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>new_end_address &lt; end<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span>    <span class="Comment">// Ugly: vma knows about the global Memory list of vmas</span>
-<span id="L122" class="LineNr">122 </span>    <span class="Normal">void</span> <a href='010---vm.cc.html#L130'>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 id="L123" class="LineNr">123 </span>    <a href='010---vm.cc.html#L130'>sanity_check</a><span class="Delimiter">(</span>start<span class="Delimiter">,</span> new_end_address<span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>    end = new_end_address<span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>    <a href='010---vm.cc.html#L102'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>new_end_address - start<span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Delimiter">}</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Comment">// End vma Methods</span>
-<span id="L128" class="LineNr">128 </span><span class="Delimiter">};</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='010---vm.cc.html#L130'>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="L131" class="LineNr">131 </span>  <span class="Normal">bool</span> dup_found =<span class="Constant"> false</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#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>    <span class="Normal">const</span> vma&amp; curr = <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </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="L135" class="LineNr">135 </span>      assert<span class="Delimiter">(</span>!dup_found<span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>      dup_found =<span class="Constant"> true</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="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="L139" class="LineNr">139 </span>      assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &gt; 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="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &lt; start<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L142" class="LineNr">142 </span>      assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>end &lt; start<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 class="Delimiter">}</span>
-<span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L148" class="LineNr">148 </span><span class="Comment">// RAM is made of VMAs.</span>
-<span id="L149" class="LineNr">149 </span>vector&lt;vma&gt; <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(code)</span>
-<span id="L151" class="LineNr">151 </span><span class="Comment">// The first 3 VMAs are special. When loading ELF binaries in later layers,</span>
-<span id="L152" class="LineNr">152 </span><span class="Comment">// we'll assume that the first VMA is for code, the second is for data</span>
-<span id="L153" class="LineNr">153 </span><span class="Comment">// (including the heap), and the third for the stack.</span>
-<span id="L154" class="LineNr">154 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L154'>grow_code_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>  assert<span class="Delimiter">(</span>!Mem<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
-<span id="L156" class="LineNr">156 </span>  <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L119'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L158'>grow_data_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L160" class="LineNr">160 </span>  <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L119'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </span><span class="Delimiter">}</span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L163" class="LineNr">163 </span><span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L163'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// when the program executes past this address in tests we'll stop the test</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment">// The stack grows downward. Can't increase its size for now.</span>
-<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L166" class="LineNr">166 </span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L167" class="LineNr">167 </span><a href='010---vm.cc.html#L163'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span><span class="Delimiter">:(code)</span>
-<span id="L169" class="LineNr">169 </span><span class="Comment">// These helpers depend on Mem being laid out contiguously (so you can't use a</span>
-<span id="L170" class="LineNr">170 </span><span class="Comment">// map, etc.) and on the host also being little-endian.</span>
-<span id="L171" class="LineNr">171 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L171'>read_mem_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Normal">uint8_t</span>* handle = <a href='010---vm.cc.html#L186'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>  <span class="Comment">// error messages get printed here</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Identifier">return</span> handle ? *handle : <span class="Constant">0</span><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">inline</span> <span class="Normal">int8_t</span> <a href='010---vm.cc.html#L175'>read_mem_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
-<span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
-<span id="L178" class="LineNr">178 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L178'>read_mem_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Normal">uint32_t</span>* handle = <a href='010---vm.cc.html#L202'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>  <span class="Comment">// error messages get printed here</span>
-<span id="L180" class="LineNr">180 </span>  <span class="Identifier">return</span> handle ? *handle : <span class="Constant">0</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="Normal">inline</span> <span class="Normal">int32_t</span> <a href='010---vm.cc.html#L182'>read_mem_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L178'>read_mem_u32</a><span class="Delimiter">(</span>addr<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">inline</span> <span class="Normal">uint8_t</span>* <a href='010---vm.cc.html#L186'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Normal">uint8_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L189" class="LineNr">189 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L109'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L190" class="LineNr">190 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L191" class="LineNr">191 </span>        <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L192" class="LineNr">192 </span>      result = &amp;Mem<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="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 class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span>
-<span id="L196" class="LineNr">196 </span>    <a href='003trace.cc.html#L211'>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#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
-<span id="L199" class="LineNr">199 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span>* <a href='010---vm.cc.html#L199'>mem_addr_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int8_t</span>*&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L186'>mem_addr_u8</a><span class="Delimiter">(</span>addr<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">inline</span> <span class="Normal">uint32_t</span>* <a href='010---vm.cc.html#L202'>mem_addr_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Normal">uint32_t</span>* result = <span class="Constant">NULL</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#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</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><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L112'>match32</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L206" class="LineNr">206 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L207" class="LineNr">207 </span>        <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L208" class="LineNr">208 </span>      result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<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="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>result == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L211'>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#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;The entire 4-byte <a href='011run.cc.html#L123'>word</a> should be initialized and lie in a single segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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">return</span> result<span class="Delimiter">;</span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span>
-<span id="L217" class="LineNr">217 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span>* <a href='010---vm.cc.html#L217'>mem_addr_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int32_t</span>*&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L202'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
-<span id="L220" class="LineNr">220 </span><span class="Comment">// helper for some syscalls. But read-only.</span>
-<span id="L221" class="LineNr">221 </span><span class="Normal">inline</span> <span class="Normal">const</span> <span class="Normal">char</span>* <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">const</span> <span class="Normal">char</span>*&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L186'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
+<span id="L37" class="LineNr"> 37 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;registers&quot;</span><span class="Delimiter">,</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Constant">&quot;SubX currently supports eight 32-bit integer registers. From 0 to 7, they are:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Constant">&quot;  <a href='010---vm.cc.html#L13'>EAX</a> <a href='010---vm.cc.html#L14'>ECX</a> <a href='010---vm.cc.html#L15'>EDX</a> <a href='010---vm.cc.html#L16'>EBX</a> <a href='010---vm.cc.html#L17'>ESP</a> <a href='010---vm.cc.html#L18'>EBP</a> <a href='010---vm.cc.html#L19'>ESI</a> <a href='010---vm.cc.html#L20'>EDI</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="Constant">&quot;ESP contains the top of the stack.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Constant">&quot;-- 8-bit registers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Constant">&quot;Some instructions operate on eight *overlapping* 8-bit registers.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Constant">&quot;From 0 to 7, they are:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Constant">&quot;  AL CL DL BL AH CH DH BH</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="Constant">&quot;The 8-bit registers overlap with the 32-bit ones. AL is the lowest signicant byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Constant">&quot;of <a href='010---vm.cc.html#L13'>EAX</a>, AH is the second lowest significant byte, and so on.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Constant">&quot;For example, if <a href='010---vm.cc.html#L16'>EBX</a> contains 0x11223344, then BL contains 0x44, and BH contains 0x33.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="Constant">&quot;There is no way to access bytes within <a href='010---vm.cc.html#L17'>ESP</a>, <a href='010---vm.cc.html#L18'>EBP</a>, <a href='010---vm.cc.html#L19'>ESI</a> or EDI.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, volume 2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Constant">&quot;table 2-2, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Constant">&quot;It is included in this repository as 'modrm.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Constant">&quot;The register encodings are described in the top row of the table, but you'll need</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Constant">&quot;to spend some time with it.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Constant">&quot;-- flag registers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Constant">&quot;Various instructions (particularly 'compare') modify one or more of three 1-bit 'flag'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Constant">&quot;registers, as a side-effect:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Constant">&quot;- the sign flag (SF): usually set if an arithmetic result is negative, or</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Constant">&quot;  <a href='000organization.cc.html#L148'>reset</a> if not.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Constant">&quot;- the zero flag (ZF): usually set if a result is zero, or <a href='000organization.cc.html#L148'>reset</a> if not.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Constant">&quot;- the overflow flag (OF): usually set if an arithmetic result overflows.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Constant">&quot;The flag bits are read by conditional jumps.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Constant">&quot;For complete details on how different instructions update the flags, consult the IA-32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Constant">&quot;manual (volume 2). There's various versions of it online, such as <a href="https://c9x.me/x86">https://c9x.me/x86</a>,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Constant">&quot;though of course you'll need to be careful to ignore instructions and flag registers</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Constant">&quot;that SubX doesn't support.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Constant">&quot;It isn't simple, but if this is the processor you have running on your computer,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Constant">&quot;might as well get good at it.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</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">:(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="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="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>
+<span id="L87" class="LineNr"> 87 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="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>
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a> = <span class="Constant">0x1000</span> - <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span><span class="Comment">// Subtract one just so we can start the first segment at address 1 without</span>
+<span id="L117" class="LineNr">117 </span><span class="Comment">// overflowing the first segment. Other segments will learn to adjust.</span>
+<span id="L118" class="LineNr">118 </span>
+<span id="L119" class="LineNr">119 </span><span class="Comment">// Like in real-world Linux, we'll allocate RAM for our programs in disjoint</span>
+<span id="L120" class="LineNr">120 </span><span class="Comment">// slabs called VMAs or Virtual Memory Areas.</span>
+<span id="L121" class="LineNr">121 </span><span class="Normal">struct</span> vma <span class="Delimiter">{</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Normal">uint32_t</span> start<span class="Delimiter">;</span>  <span class="Comment">// inclusive</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Normal">uint32_t</span> end<span class="Delimiter">;</span>  <span class="Comment">// exclusive</span>
+<span id="L124" class="LineNr">124 </span>  vector&lt;<span class="Normal">uint8_t</span>&gt; <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">;</span>
+<span id="L125" class="LineNr">125 </span>  vma<span class="Delimiter">(</span><span class="Normal">uint32_t</span> s<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e<span class="Delimiter">)</span> :start<span class="Delimiter">(</span>s<span class="Delimiter">),</span> end<span class="Delimiter">(</span>e<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>    <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Delimiter">}</span>
+<span id="L128" class="LineNr">128 </span>  vma<span class="Delimiter">(</span><span class="Normal">uint32_t</span> s<span class="Delimiter">)</span> :start<span class="Delimiter">(</span>s<span class="Delimiter">),</span> end<span class="Delimiter">(</span>s+INITIAL_SEGMENT_SIZE<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L129" class="LineNr">129 </span>    <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Delimiter">}</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Normal">bool</span> <a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Identifier">return</span> a &gt;= start &amp;&amp; a &lt; end<span class="Delimiter">;</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Delimiter">}</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Normal">bool</span> <a href='010---vm.cc.html#L134'>match32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>    <span class="Identifier">return</span> a &gt;= start &amp;&amp; a+<span class="Constant">4</span> &lt;= end<span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Delimiter">}</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">uint8_t</span>&amp; data<span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L138" class="LineNr">138 </span>    assert<span class="Delimiter">(</span><a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span>a<span class="Delimiter">));</span>
+<span id="L139" class="LineNr">139 </span>    <span class="Identifier">return</span> <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>a-start<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Normal">void</span> <a href='010---vm.cc.html#L141'>grow_until</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>new_end_address &lt; end<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span>    <span class="Comment">// Ugly: vma knows about the global Memory list of vmas</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Normal">void</span> <a href='010---vm.cc.html#L152'>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 id="L145" class="LineNr">145 </span>    <a href='010---vm.cc.html#L152'>sanity_check</a><span class="Delimiter">(</span>start<span class="Delimiter">,</span> new_end_address<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>    end = new_end_address<span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>    <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>new_end_address - start<span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Delimiter">}</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Comment">// End vma Methods</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">};</span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">:(code)</span>
+<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L152'>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="L153" class="LineNr">153 </span>  <span class="Normal">bool</span> dup_found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L155" class="LineNr">155 </span>    <span class="Normal">const</span> vma&amp; curr = <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </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="L157" class="LineNr">157 </span>      assert<span class="Delimiter">(</span>!dup_found<span class="Delimiter">);</span>
+<span id="L158" class="LineNr">158 </span>      dup_found =<span class="Constant"> true</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="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="L161" class="LineNr">161 </span>      assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &gt; end<span class="Delimiter">);</span>
+<span id="L162" class="LineNr">162 </span>    <span class="Delimiter">}</span>
+<span id="L163" class="LineNr">163 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start &lt; start<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L164" class="LineNr">164 </span>      assert<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>end &lt; start<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">:(before &quot;End Globals&quot;)</span>
+<span id="L170" class="LineNr">170 </span><span class="Comment">// RAM is made of VMAs.</span>
+<span id="L171" class="LineNr">171 </span>vector&lt;vma&gt; <a href='010---vm.cc.html#L171'>Mem</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="Comment">// The first 3 VMAs are special. When loading ELF binaries in later layers,</span>
+<span id="L174" class="LineNr">174 </span><span class="Comment">// we'll assume that the first VMA is for code, the second is for data</span>
+<span id="L175" class="LineNr">175 </span><span class="Comment">// (including the heap), and the third for the stack.</span>
+<span id="L176" class="LineNr">176 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L176'>grow_code_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>  assert<span class="Delimiter">(</span>!Mem<span class="Delimiter">.</span>empty<span class="Delimiter">());</span>
+<span id="L178" class="LineNr">178 </span>  <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L141'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span><span class="Delimiter">}</span>
+<span id="L180" class="LineNr">180 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L180'>grow_data_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L181" class="LineNr">181 </span>  assert<span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">)</span> &gt; <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L141'>grow_until</a><span class="Delimiter">(</span>new_end_address<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">:(before &quot;End Globals&quot;)</span>
+<span id="L185" class="LineNr">185 </span><span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L185'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// when the program executes past this address in tests we'll stop the test</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment">// The stack grows downward. Can't increase its size for now.</span>
+<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L188" class="LineNr">188 </span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L189" class="LineNr">189 </span><a href='010---vm.cc.html#L185'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">:(code)</span>
+<span id="L191" class="LineNr">191 </span><span class="Comment">// These helpers depend on Mem being laid out contiguously (so you can't use a</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">// map, etc.) and on the host also being little-endian.</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L194" class="LineNr">194 </span>  <span class="Normal">uint8_t</span>* handle = <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>  <span class="Comment">// error messages get printed here</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Identifier">return</span> handle ? *handle : <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span>
+<span id="L197" class="LineNr">197 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span> <a href='010---vm.cc.html#L197'>read_mem_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L198" class="LineNr">198 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span>
+<span id="L200" class="LineNr">200 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Normal">uint32_t</span>* handle = <a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>  <span class="Comment">// error messages get printed here</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Identifier">return</span> handle ? *handle : <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L203" class="LineNr">203 </span><span class="Delimiter">}</span>
+<span id="L204" class="LineNr">204 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span> <a href='010---vm.cc.html#L204'>read_mem_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Identifier">return</span> <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
+<span id="L207" class="LineNr">207 </span>
+<span id="L208" class="LineNr">208 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span>* <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Normal">uint8_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L211" class="LineNr">211 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L212" class="LineNr">212 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
+<span id="L213" class="LineNr">213 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </span>      result = &amp;Mem<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="L215" class="LineNr">215 </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="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span>
+<span id="L218" class="LineNr">218 </span>    <a href='003trace.cc.html#L210'>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#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
+<span id="L221" class="LineNr">221 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span>* <a href='010---vm.cc.html#L221'>mem_addr_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int8_t</span>*&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
 <span id="L223" class="LineNr">223 </span><span class="Delimiter">}</span>
-<span id="L224" class="LineNr">224 </span>
-<span id="L225" class="LineNr">225 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L225'>write_mem_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Normal">uint8_t</span>* handle = <a href='010---vm.cc.html#L186'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span>
-<span id="L228" class="LineNr">228 </span><span class="Delimiter">}</span>
-<span id="L229" class="LineNr">229 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L229'>write_mem_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Normal">int8_t</span>* handle = <a href='010---vm.cc.html#L199'>mem_addr_i8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<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">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L233'>write_mem_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">uint32_t</span>* handle = <a href='010---vm.cc.html#L202'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
-<span id="L237" class="LineNr">237 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L237'>write_mem_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L238" class="LineNr">238 </span>  <span class="Normal">int32_t</span>* handle = <a href='010---vm.cc.html#L217'>mem_addr_i32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L239" class="LineNr">239 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<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="Normal">inline</span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L242'>already_allocated</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L245" class="LineNr">245 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L109'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L246" class="LineNr">246 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
-<span id="L247" class="LineNr">247 </span>        <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L248" class="LineNr">248 </span>      result =<span class="Constant"> true</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="Delimiter">}</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
+<span id="L224" class="LineNr">224 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span>* <a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">uint32_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L227" class="LineNr">227 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L134'>match32</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L228" class="LineNr">228 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
+<span id="L229" class="LineNr">229 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L230" class="LineNr">230 </span>      result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<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="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>result == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L234" class="LineNr">234 </span>    <a href='003trace.cc.html#L210'>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#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L235" class="LineNr">235 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;The entire 4-byte <a href='011run.cc.html#L123'>word</a> should be initialized and lie in a single segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Delimiter">}</span>
+<span id="L237" class="LineNr">237 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L238" class="LineNr">238 </span><span class="Delimiter">}</span>
+<span id="L239" class="LineNr">239 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span>* <a href='010---vm.cc.html#L239'>mem_addr_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L240" class="LineNr">240 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int32_t</span>*&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">}</span>
+<span id="L242" class="LineNr">242 </span><span class="Comment">// helper for some syscalls. But read-only.</span>
+<span id="L243" class="LineNr">243 </span><span class="Normal">inline</span> <span class="Normal">const</span> <span class="Normal">char</span>* <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">const</span> <span class="Normal">char</span>*&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
+<span id="L246" class="LineNr">246 </span><span class="Normal">inline</span> string <a href='010---vm.cc.html#L246'>mem_addr_string</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </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; size<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
+<span id="L249" class="LineNr">249 </span>    out &lt;&lt; <a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>addr+i<span class="Delimiter">);</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L251" class="LineNr">251 </span><span class="Delimiter">}</span>
+<span id="L252" class="LineNr">252 </span>
 <span id="L253" class="LineNr">253 </span>
-<span id="L254" class="LineNr">254 </span><span class="SalientComment">//:: core interpreter loop</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="Comment">// skeleton of how x86 instructions are decoded</span>
-<span id="L258" class="LineNr">258 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L258'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L259" class="LineNr">259 </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="L260" class="LineNr">260 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L261" class="LineNr">261 </span><span class="CommentedCode">//?   dump_registers();</span>
-<span id="L262" class="LineNr">262 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;inst: 0x&quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot;;</span>
-<span id="L263" class="LineNr">263 </span>  op = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L264" class="LineNr">264 </span><span class="CommentedCode">//?   cerr &lt;&lt; HEXBYTE &lt;&lt; NUM(op) &lt;&lt; '\n';</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
-<span id="L267" class="LineNr">267 </span>    <a href='010---vm.cc.html#L29'>EIP</a> = <a href='010---vm.cc.html#L163'>End_of_program</a><span class="Delimiter">;</span>
-<span id="L268" class="LineNr">268 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L269" class="LineNr">269 </span>  <span class="Comment">// End Single-Byte Opcodes</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L271" class="LineNr">271 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L272" class="LineNr">272 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
-<span id="L273" class="LineNr">273 </span>    <span class="Normal">default</span>:
-<span id="L274" class="LineNr">274 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L275" class="LineNr">275 </span>      <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L276" class="LineNr">276 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</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">break</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Normal">case</span> <span class="Constant">0xf2</span>:
-<span id="L280" class="LineNr">280 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With f2</span>
-<span id="L282" class="LineNr">282 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L283" class="LineNr">283 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L284" class="LineNr">284 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f2 0f</span>
-<span id="L285" class="LineNr">285 </span>      <span class="Normal">default</span>:
-<span id="L286" class="LineNr">286 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f2 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span>        <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L288" class="LineNr">288 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L289" class="LineNr">289 </span>      <span class="Delimiter">}</span>
-<span id="L290" class="LineNr">290 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L291" class="LineNr">291 </span>    <span class="Normal">default</span>:
-<span id="L292" class="LineNr">292 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f2: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>      <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L294" class="LineNr">294 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><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">break</span><span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
-<span id="L298" class="LineNr">298 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L299" class="LineNr">299 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L301" class="LineNr">301 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L302" class="LineNr">302 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
-<span id="L303" class="LineNr">303 </span>      <span class="Normal">default</span>:
-<span id="L304" class="LineNr">304 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>        <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L306" class="LineNr">306 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L307" class="LineNr">307 </span>      <span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span>    <span class="Normal">default</span>:
-<span id="L310" class="LineNr">310 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L311" class="LineNr">311 </span>      <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L312" class="LineNr">312 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L313" class="LineNr">313 </span>    <span class="Delimiter">}</span>
-<span id="L314" class="LineNr">314 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Normal">default</span>:
-<span id="L316" class="LineNr">316 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L317" class="LineNr">317 </span>    <a href='003trace.cc.html#L208'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L318" class="LineNr">318 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L319" class="LineNr">319 </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="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L171'>read_mem_u8</a><span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
-<span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
-<span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L326'>dump_registers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L327" class="LineNr">327 </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='010---vm.cc.html#L21'>NUM_INT_REGISTERS</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L328" class="LineNr">328 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">&quot;; &quot;</span><span class="Delimiter">;</span>
-<span id="L329" class="LineNr">329 </span>    cerr &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; Reg[i]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Delimiter">}</span>
-<span id="L331" class="LineNr">331 </span>  cerr &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#L59'>OF</a>: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <span class="cSpecial">'\n'</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="Comment">//: start tracking supported opcodes</span>
-<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L336" class="LineNr">336 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">;</span>
-<span id="L338" class="LineNr">338 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L338'>name_f3</a><span class="Delimiter">;</span>
-<span id="L339" class="LineNr">339 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L339'>name_f3_0f</a><span class="Delimiter">;</span>
-<span id="L340" class="LineNr">340 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L341" class="LineNr">341 </span><a href='010---vm.cc.html#L343'>init_op_names</a><span class="Delimiter">();</span>
-<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(code)</span>
-<span id="L343" class="LineNr">343 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L343'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L344" class="LineNr">344 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;halt&quot;</span><span class="Delimiter">);</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Comment">// End Initialize Op Names(name)</span>
-<span id="L346" class="LineNr">346 </span><span class="Delimiter">}</span>
-<span id="L347" class="LineNr">347 </span>
-<span id="L348" class="LineNr">348 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)&quot;)</span>
-<span id="L349" class="LineNr">349 </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="L350" class="LineNr">350 </span>  cerr &lt;&lt; <span class="Constant">&quot;Opcodes currently supported by SubX:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L352" class="LineNr">352 </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="L353" class="LineNr">353 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L354" class="LineNr">354 </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="L355" class="LineNr">355 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L338'>name_f3</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L338'>name_f3</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L356" class="LineNr">356 </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="L357" class="LineNr">357 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L339'>name_f3_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L339'>name_f3_0f</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
-<span id="L358" class="LineNr">358 </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="L359" class="LineNr">359 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L118'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L361" class="LineNr">361 </span><span class="Delimiter">}</span>
-<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
-<span id="L363" class="LineNr">363 </span>cerr &lt;&lt; <span class="Constant">&quot;  opcodes</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L364" class="LineNr">364 </span>
-<span id="L365" class="LineNr">365 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment">#include &lt;iomanip&gt;</span>
-<span id="L367" class="LineNr">367 </span><span class="Comment">#define HEXBYTE  std::hex &lt;&lt; std::setw(2) &lt;&lt; std::setfill('0')</span>
-<span id="L368" class="LineNr">368 </span><span class="Comment">#define HEXWORD  std::hex &lt;&lt; std::setw(8) &lt;&lt; std::setfill('0')</span>
-<span id="L369" class="LineNr">369 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L370" class="LineNr">370 </span><span class="Comment">#define NUM(X) static_cast&lt;int&gt;(X)</span>
-<span id="L371" class="LineNr">371 </span><span class="Comment">#include &lt;stdint.h&gt;</span>
+<span id="L254" class="LineNr">254 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Normal">uint8_t</span>* handle = <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<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">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L258'>write_mem_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Normal">int8_t</span>* handle = <a href='010---vm.cc.html#L221'>mem_addr_i8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span>
+<span id="L261" class="LineNr">261 </span><span class="Delimiter">}</span>
+<span id="L262" class="LineNr">262 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L262'>write_mem_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">uint32_t</span>* handle = <a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span>
+<span id="L265" class="LineNr">265 </span><span class="Delimiter">}</span>
+<span id="L266" class="LineNr">266 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L266'>write_mem_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Normal">int32_t</span>* handle = <a href='010---vm.cc.html#L239'>mem_addr_i32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<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">inline</span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L271'>already_allocated</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</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; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L274" class="LineNr">274 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L275" class="LineNr">275 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span>
+<span id="L276" class="LineNr">276 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L277" class="LineNr">277 </span>      result =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L278" class="LineNr">278 </span>    <span class="Delimiter">}</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Delimiter">}</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span>
+<span id="L282" class="LineNr">282 </span>
+<span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: core interpreter loop</span>
+<span id="L284" class="LineNr">284 </span>
+<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(code)</span>
+<span id="L286" class="LineNr">286 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span>
+<span id="L287" class="LineNr">287 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L287'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L288" class="LineNr">288 </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="L289" class="LineNr">289 </span>  <span class="Comment">// Run One Instruction</span>
+<span id="L290" class="LineNr">290 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;inst: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span>  op = <a href='010---vm.cc.html#L354'>next</a><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#L188'>Dump_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L293" class="LineNr">293 </span>    cerr &lt;&lt; <span class="Constant">&quot;opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>    cerr &lt;&lt; <span class="Constant">&quot;registers at start: &quot;</span><span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span>    <a href='010---vm.cc.html#L358'>dump_registers</a><span class="Delimiter">();</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
+<span id="L299" class="LineNr">299 </span>    <a href='010---vm.cc.html#L29'>EIP</a> = <a href='010---vm.cc.html#L185'>End_of_program</a><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Comment">// End Single-Byte Opcodes</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L303" class="LineNr">303 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L304" class="LineNr">304 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
+<span id="L305" class="LineNr">305 </span>    <span class="Normal">default</span>:
+<span id="L306" class="LineNr">306 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L307" class="LineNr">307 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L308" class="LineNr">308 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L309" class="LineNr">309 </span>    <span class="Delimiter">}</span>
+<span id="L310" class="LineNr">310 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Normal">case</span> <span class="Constant">0xf2</span>:
+<span id="L312" class="LineNr">312 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L354'>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 f2</span>
+<span id="L314" class="LineNr">314 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L315" class="LineNr">315 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f2 0f</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Normal">default</span>:
+<span id="L318" class="LineNr">318 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f2 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L319" class="LineNr">319 </span>        <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</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">break</span><span class="Delimiter">;</span>
+<span id="L323" class="LineNr">323 </span>    <span class="Normal">default</span>:
+<span id="L324" class="LineNr">324 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f2: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L325" class="LineNr">325 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L326" class="LineNr">326 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L327" class="LineNr">327 </span>    <span class="Delimiter">}</span>
+<span id="L328" class="LineNr">328 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L329" class="LineNr">329 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
+<span id="L330" class="LineNr">330 </span>    <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L331" class="LineNr">331 </span>    <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
+<span id="L332" class="LineNr">332 </span>    <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L333" class="LineNr">333 </span>      <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L334" class="LineNr">334 </span>      <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
+<span id="L335" class="LineNr">335 </span>      <span class="Normal">default</span>:
+<span id="L336" class="LineNr">336 </span>        cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L337" class="LineNr">337 </span>        <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L338" class="LineNr">338 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L339" class="LineNr">339 </span>      <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="Normal">default</span>:
+<span id="L342" class="LineNr">342 </span>      cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </span>      <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L344" class="LineNr">344 </span>      exit<span class="Delimiter">(</span><span class="Constant">1</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">break</span><span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Normal">default</span>:
+<span id="L348" class="LineNr">348 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span>    <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L350" class="LineNr">350 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Delimiter">}</span>
+<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
+<span id="L353" class="LineNr">353 </span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
+<span id="L356" class="LineNr">356 </span><span class="Delimiter">}</span>
+<span id="L357" class="LineNr">357 </span>
+<span id="L358" class="LineNr">358 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L358'>dump_registers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L359" class="LineNr">359 </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='010---vm.cc.html#L21'>NUM_INT_REGISTERS</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr">360 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">&quot;; &quot;</span><span class="Delimiter">;</span>
+<span id="L361" class="LineNr">361 </span>    cerr &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; Reg[i]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>  cerr &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> &lt;&lt; <span class="cSpecial">'\n'</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="Comment">//: start tracking supported opcodes</span>
+<span id="L367" class="LineNr">367 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L368" class="LineNr">368 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">;</span>
+<span id="L369" class="LineNr">369 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">;</span>
+<span id="L370" class="LineNr">370 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L370'>Name_f3</a><span class="Delimiter">;</span>
+<span id="L371" class="LineNr">371 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string&gt; <a href='010---vm.cc.html#L371'>Name_f3_0f</a><span class="Delimiter">;</span>
+<span id="L372" class="LineNr">372 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L373" class="LineNr">373 </span><a href='010---vm.cc.html#L375'>init_op_names</a><span class="Delimiter">();</span>
+<span id="L374" class="LineNr">374 </span><span class="Delimiter">:(code)</span>
+<span id="L375" class="LineNr">375 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L375'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L376" class="LineNr">376 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L377" class="LineNr">377 </span>  <span class="Comment">// End Initialize Op Names</span>
+<span id="L378" class="LineNr">378 </span><span class="Delimiter">}</span>
+<span id="L379" class="LineNr">379 </span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)&quot;)</span>
+<span id="L381" class="LineNr">381 </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="L382" class="LineNr">382 </span>  cerr &lt;&lt; <span class="Constant">&quot;Opcodes currently supported by SubX:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L384" class="LineNr">384 </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="L385" class="LineNr">385 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L386" class="LineNr">386 </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="L387" class="LineNr">387 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L370'>Name_f3</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L370'>Name_f3</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L388" class="LineNr">388 </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="L389" class="LineNr">389 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>map&lt;string<span class="Delimiter">,</span> string&gt;::iterator p = <a href='010---vm.cc.html#L371'>Name_f3_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='010---vm.cc.html#L371'>Name_f3_0f</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L390" class="LineNr">390 </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="L391" class="LineNr">391 </span>  cerr &lt;&lt; <span class="Constant">&quot;Run `subx help instructions` for details on <a href='011run.cc.html#L118'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L392" class="LineNr">392 </span>          <span class="Constant">&quot;For complete details on these instructions, consult the IA-32 manual (volume 2).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L393" class="LineNr">393 </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>.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L394" class="LineNr">394 </span>          <span class="Constant">&quot;The mnemonics in brackets will help you locate each instruction.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span>
+<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
+<span id="L398" class="LineNr">398 </span>cerr &lt;&lt; <span class="Constant">&quot;  opcodes</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</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">#include &lt;iomanip&gt;</span>
+<span id="L402" class="LineNr">402 </span><span class="Comment">#define HEXBYTE  std::hex &lt;&lt; std::setw(2) &lt;&lt; std::setfill('0')</span>
+<span id="L403" class="LineNr">403 </span><span class="Comment">#define HEXWORD  std::hex &lt;&lt; std::setw(8) &lt;&lt; std::setfill('0')</span>
+<span id="L404" class="LineNr">404 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
+<span id="L405" class="LineNr">405 </span><span class="Comment">#define NUM(X) static_cast&lt;int&gt;(X)</span>
+<span id="L406" class="LineNr">406 </span><span class="Comment">#include &lt;stdint.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index f4049fcf..3f4e84af 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -67,7 +67,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: the VM. That comes later.)</span>
 <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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;syntax&quot;</span><span class="Delimiter">,</span>
+<span id="L7" class="LineNr">  7 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;syntax&quot;</span><span class="Delimiter">,</span>
 <span id="L8" class="LineNr">  8 </span>  <span class="Constant">&quot;SubX programs consist of <a href='011run.cc.html#L100'>segments</a>, each segment in turn consisting of lines.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L9" class="LineNr">  9 </span>  <span class="Constant">&quot;Line-endings are significant; each <a href='011run.cc.html#L117'>line</a> should contain a single</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">&quot;instruction, macro or directive.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -75,27 +75,27 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr"> 12 </span>  <span class="Constant">&quot;Comments start with the '#' character. It should be at the start of a <a href='011run.cc.html#L123'>word</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L13" class="LineNr"> 13 </span>  <span class="Constant">&quot;(start of <a href='011run.cc.html#L117'>line</a>, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L117'>line</a>: a '==' delimiter followed by the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Constant">&quot;starting address for the segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L15" class="LineNr"> 15 </span>  <span class="Constant">&quot;Each segment starts with a header <a href='011run.cc.html#L117'>line</a>: a '==' delimiter followed by the name of</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="Constant">&quot;the segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;The starting address for a segment has some finicky requirements. But just</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;start with a round number, and `subx` will try to guide you to a valid</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;configuration.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;A good rule of thumb is to try to start the first segment at the default</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;address of 0x08048000, and to start each subsequent segment at least 0x1000</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(most common page size) bytes after the last.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;If a segment occupies than 0x1000 bytes you'll need to push subsequent</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;segments further down.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Constant">&quot;Currently only the first segment contains executable <a href='031check_operands.cc.html#L14'>code</a> (because it gets</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;annoying to have to change addresses in later <a href='011run.cc.html#L100'>segments</a> every time an earlier</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Constant">&quot;one changes length; one of those finicky requirements).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;Currently SubX assumes the first segment encountered contains executable <a href='031check_operands.cc.html#L11'>code</a>, and</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;the second contains global variables. By convention we call them 'code' and 'data'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;respectively.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;The first instruction executed in the resulting binary is always the first</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;instruction of the first segment.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;Segments with the same name get merged together. This rule helps keep functions and</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;their data close together in .subx files.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Constant">&quot;Later <a href='011run.cc.html#L100'>segments</a> with the same name get their <a href='003trace.cc.html#L74'>contents</a> *prepended* to earlier ones.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Constant">&quot;This rule helps each .subx file to <a href='001help.cc.html#L243'>put</a> forth a different entrypoint for the binary,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Constant">&quot;overriding previously loaded files.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Constant">&quot;Lines consist of a series of words. Words can contain arbitrary metadata</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Constant">&quot;after a '/', but they can never contain whitespace. Metadata has no effect</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Constant">&quot;at runtime, but can be handy when rewriting macros.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Constant">&quot;Check out some examples in this directory (ex*.subx)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Constant">&quot;Programming in machine <a href='031check_operands.cc.html#L14'>code</a> can be annoying, but let's see if we can make</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Constant">&quot;Check out the examples in the examples/ directory.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Constant">&quot;Programming in machine <a href='031check_operands.cc.html#L11'>code</a> can be annoying, but let's see if we can make</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Constant">&quot;it nice enough to be able to write a compiler in it.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">);</span>
 <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Contents&quot;)</span>
@@ -147,13 +147,13 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L85" class="LineNr"> 85 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  parse<span class="Delimiter">(</span>in<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#L225'>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="L87" class="LineNr"> 87 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
 <span id="L88" class="LineNr"> 88 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr"> 90 </span>  <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L163'>End_of_program</a><span class="Delimiter">)</span>
-<span id="L93" class="LineNr"> 93 </span>    <a href='010---vm.cc.html#L258'>run_one_instruction</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L185'>End_of_program</a><span class="Delimiter">)</span>
+<span id="L93" class="LineNr"> 93 </span>    <a href='010---vm.cc.html#L287'>run_one_instruction</a><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="SalientComment">//:: core data structures</span>
@@ -194,16 +194,16 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(code)</span>
 <span id="L132" class="LineNr">132 </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="L133" class="LineNr">133 </span>  vector&lt;line&gt; l<span class="Delimiter">;</span>
-<span id="L134" class="LineNr">134 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L134" class="LineNr">134 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L136" class="LineNr">136 </span>    string line_data<span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>    <a href='011run.cc.html#L117'>line</a> curr<span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span>    getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>    curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L204'>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="L140" class="LineNr">140 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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="L141" class="LineNr">141 </span>    <span class="Comment">// End Line Parsing Special-cases(line_data -&gt; l)</span>
 <span id="L142" class="LineNr">142 </span>    istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L143" class="LineNr">143 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L144" class="LineNr">144 </span>      string word_data<span class="Delimiter">;</span>
 <span id="L145" class="LineNr">145 </span>      lin &gt;&gt; word_data<span class="Delimiter">;</span>
 <span id="L146" class="LineNr">146 </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>
@@ -217,8 +217,8 @@ if ('onhashchange' in window) {
 <span id="L154" class="LineNr">154 </span>          segment s<span class="Delimiter">;</span>
 <span id="L155" class="LineNr">155 </span>          s<span class="Delimiter">.</span>start = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span>
 <span id="L156" class="LineNr">156 </span>          <a href='011run.cc.html#L201'>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="L157" class="LineNr">157 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L158" class="LineNr">158 </span>          <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment from 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>          <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L403'>HEXWORD</a> &lt;&lt; s<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L159" class="LineNr">159 </span>          out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
 <span id="L160" class="LineNr">160 </span>        <span class="Delimiter">}</span>
 <span id="L161" class="LineNr">161 </span>        <span class="Comment">// End Segment Parsing Special-cases(segment_title)</span>
@@ -231,23 +231,23 @@ if ('onhashchange' in window) {
 <span id="L168" class="LineNr">168 </span>      <span class="Delimiter">}</span>
 <span id="L169" class="LineNr">169 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
 <span id="L170" class="LineNr">170 </span>      <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>word_data<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
-<span id="L171" class="LineNr">171 </span>      <a href='003trace.cc.html#L204'>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#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
+<span id="L171" class="LineNr">171 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
 <span id="L172" class="LineNr">172 </span>    <span class="Delimiter">}</span>
 <span id="L173" class="LineNr">173 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
 <span id="L174" class="LineNr">174 </span>      l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
 <span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
 <span id="L176" class="LineNr">176 </span>  <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>  <a href='003trace.cc.html#L204'>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="L177" class="LineNr">177 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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="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='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> vector&lt;line&gt;&amp; <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L182" class="LineNr">182 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L183" class="LineNr">183 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L183" class="LineNr">183 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L184" class="LineNr">184 </span>    <span class="Identifier">return</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="Comment">// End flush(p, lines) Special-cases</span>
-<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L188" class="LineNr">188 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>
 <span id="L189" class="LineNr">189 </span><span class="Delimiter">}</span>
 <span id="L190" class="LineNr">190 </span>
@@ -264,7 +264,7 @@ if ('onhashchange' in window) {
 <span id="L201" class="LineNr">201 </span><span class="Normal">void</span> <a href='011run.cc.html#L201'>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="L202" class="LineNr">202 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L203" class="LineNr">203 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start == addr<span class="Delimiter">)</span>
-<span id="L204" class="LineNr">204 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;can't have multiple segments starting at address 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L204" class="LineNr">204 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;can't have multiple segments starting at address 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Delimiter">}</span>
 <span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
 <span id="L207" class="LineNr">207 </span>
@@ -292,18 +292,18 @@ if ('onhashchange' in window) {
 <span id="L229" class="LineNr">229 </span>vector&lt;transform_fn&gt; <a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">;</span>
 <span id="L230" class="LineNr">230 </span>
 <span id="L231" class="LineNr">231 </span><span class="Normal">void</span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span>  t &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">);</span>  ++t<span class="Delimiter">)</span>
 <span id="L234" class="LineNr">234 </span>    <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span>
-<span id="L235" class="LineNr">235 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L235" class="LineNr">235 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; 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="SalientComment">//:: load</span>
 <span id="L239" class="LineNr">239 </span>
 <span id="L240" class="LineNr">240 </span><span class="Normal">void</span> <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;begin&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L14'>code</a> to <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;no <a href='031check_operands.cc.html#L11'>code</a> to <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L244" class="LineNr">244 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Delimiter">}</span>
 <span id="L246" class="LineNr">246 </span>  <span class="Comment">// Ensure segments are disjoint.</span>
@@ -312,25 +312,25 @@ if ('onhashchange' in window) {
 <span id="L249" class="LineNr">249 </span>    <span class="Normal">const</span> segment&amp; seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L250" class="LineNr">250 </span>    <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
 <span id="L251" class="LineNr">251 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!already_allocated<span class="Delimiter">(</span>addr<span class="Delimiter">))</span>
-<span id="L252" class="LineNr">252 </span>      <a href='010---vm.cc.html#L149'>Mem</a><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="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L204'>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#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L252" class="LineNr">252 </span>      <a href='010---vm.cc.html#L171'>Mem</a><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="L253" class="LineNr">253 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L254" class="LineNr">254 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L255" class="LineNr">255 </span>      <span class="Normal">const</span> line&amp; l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L256" class="LineNr">256 </span>      <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span>  k &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L257" class="LineNr">257 </span>        <span class="Normal">const</span> word&amp; w = l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span>
 <span id="L258" class="LineNr">258 </span>        <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L259" class="LineNr">259 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L259" class="LineNr">259 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>        <a href='010---vm.cc.html#L225'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L261" class="LineNr">261 </span>        <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="L262" class="LineNr">262 </span>        overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>addr<span class="Delimiter">);</span>
-<span id="L263" class="LineNr">263 </span>        <a href='003trace.cc.html#L204'>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#L368'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L263" class="LineNr">263 </span>        <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L264" class="LineNr">264 </span>        ++addr<span class="Delimiter">;</span>
 <span id="L265" class="LineNr">265 </span>      <span class="Delimiter">}</span>
 <span id="L266" class="LineNr">266 </span>    <span class="Delimiter">}</span>
-<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L163'>End_of_program</a> = addr<span class="Delimiter">;</span>
+<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L185'>End_of_program</a> = addr<span class="Delimiter">;</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Delimiter">}</span>
 <span id="L269" class="LineNr">269 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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="L270" class="LineNr">270 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;done&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L271" class="LineNr">271 </span><span class="Delimiter">}</span>
 <span id="L272" class="LineNr">272 </span>
 <span id="L273" class="LineNr">273 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -338,11 +338,11 @@ if ('onhashchange' in window) {
 <span id="L275" class="LineNr">275 </span>  <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L276" class="LineNr">276 </span>  in &gt;&gt; std::hex &gt;&gt; result<span class="Delimiter">;</span>
 <span id="L277" class="LineNr">277 </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="L278" class="LineNr">278 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L278" class="LineNr">278 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L279" class="LineNr">279 </span>    <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
 <span id="L280" class="LineNr">280 </span>  <span class="Delimiter">}</span>
 <span id="L281" class="LineNr">281 </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="L282" class="LineNr">282 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L282" class="LineNr">282 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;token '&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; 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="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>
@@ -383,31 +383,31 @@ if ('onhashchange' in window) {
 <span id="L320" class="LineNr">320 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
 <span id="L321" class="LineNr">321 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
 <span id="L322" class="LineNr">322 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>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="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// if any stage raises errors, stop immediately</span>
 <span id="L324" class="LineNr">324 </span>  <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span>p<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="SalientComment">//:: run</span>
 <span id="L328" class="LineNr">328 </span>
-<span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
 <span id="L331" class="LineNr">331 </span>
 <span id="L332" class="LineNr">332 </span><span class="Comment">//: our first opcode</span>
 <span id="L333" class="LineNr">333 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L334" class="LineNr">334 </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="L335" class="LineNr">335 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>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="L337" class="LineNr">337 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="L337" class="LineNr">337 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L338" class="LineNr">338 </span>  <span class="Identifier">break</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="Delimiter">:(code)</span>
 <span id="L342" class="LineNr">342 </span><span class="Comment">// read a 32-bit int in little-endian order from the instruction stream</span>
 <span id="L343" class="LineNr">343 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L345" class="LineNr">345 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L346" class="LineNr">346 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L347" class="LineNr">347 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
+<span id="L344" class="LineNr">344 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L345" class="LineNr">345 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L346" class="LineNr">346 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L347" class="LineNr">347 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
 <span id="L348" class="LineNr">348 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
 <span id="L350" class="LineNr">350 </span>
@@ -430,7 +430,7 @@ if ('onhashchange' in window) {
 <span id="L367" class="LineNr">367 </span>    <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L368" class="LineNr">368 </span>    in &gt;&gt; result<span class="Delimiter">;</span>
 <span id="L369" class="LineNr">369 </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="L370" class="LineNr">370 </span>      <a href='003trace.cc.html#L211'>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="L370" class="LineNr">370 </span>      <a href='003trace.cc.html#L210'>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="L371" class="LineNr">371 </span>      <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L372" class="LineNr">372 </span>    <span class="Delimiter">}</span>
 <span id="L373" class="LineNr">373 </span>    <span class="Identifier">return</span> result<span class="Delimiter">;</span>
@@ -438,7 +438,7 @@ if ('onhashchange' in window) {
 <span id="L375" class="LineNr">375 </span>  <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L376" class="LineNr">376 </span>  in &gt;&gt; uresult<span class="Delimiter">;</span>
 <span id="L377" class="LineNr">377 </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="L378" class="LineNr">378 </span>    <a href='003trace.cc.html#L211'>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="L378" class="LineNr">378 </span>    <a href='003trace.cc.html#L210'>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="L379" class="LineNr">379 </span>    <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L380" class="LineNr">380 </span>  <span class="Delimiter">}</span>
 <span id="L381" class="LineNr">381 </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>
diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html
index 919c4689..d65422b4 100644
--- a/html/subx/012elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -64,27 +64,27 @@ 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#L89'>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#L253'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L8" class="LineNr">  8 </span>  <a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
 <span id="L9" class="LineNr">  9 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L10" class="LineNr"> 10 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L11" class="LineNr"> 11 </span>  cerr &lt;&lt; std::hex<span class="Delimiter">;</span>
 <span id="L12" class="LineNr"> 12 </span>  <a href='012elf.cc.html#L20'>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="L13" class="LineNr"> 13 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L163'>End_of_program</a><span class="Delimiter">)</span>  <span class="Comment">// weak final-gasp termination check</span>
-<span id="L14" class="LineNr"> 14 </span>    <a href='010---vm.cc.html#L258'>run_one_instruction</a><span class="Delimiter">();</span>
-<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;executed past end of the world: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L163'>End_of_program</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L13" class="LineNr"> 13 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L185'>End_of_program</a><span class="Delimiter">)</span>  <span class="Comment">// weak final-gasp termination check</span>
+<span id="L14" class="LineNr"> 14 </span>    <a href='010---vm.cc.html#L287'>run_one_instruction</a><span class="Delimiter">();</span>
+<span id="L15" class="LineNr"> 15 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;executed past end of the world: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot; vs &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L185'>End_of_program</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L16" class="LineNr"> 16 </span>  <span class="Identifier">return</span> <span class="Constant">0</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="Delimiter">:(code)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='012elf.cc.html#L20'>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="L21" class="LineNr"> 21 </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="L22" class="LineNr"> 22 </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#L211'>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#L152'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </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#L210'>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#L150'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </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="L24" class="LineNr"> 24 </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="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </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#L211'>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#L152'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </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#L210'>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#L150'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L27" class="LineNr"> 27 </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="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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#L152'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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#L150'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L29" class="LineNr"> 29 </span>  <a href='012elf.cc.html#L33'>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="L30" class="LineNr"> 30 </span>  free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span>
@@ -93,25 +93,25 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </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="L35" class="LineNr"> 35 </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="L36" class="LineNr"> 36 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>memcmp<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\177</span><span class="Constant">ELF&quot;</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L38" class="LineNr"> 38 </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="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L40" class="LineNr"> 40 </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="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Comment">// unused: remaining 10 bytes of e_ident</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_machine_type != <span class="Constant">0x00030002</span><span class="Delimiter">)</span>
-<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L45" class="LineNr"> 45 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Comment">// unused: e_version. We only support version 1, and later versions will be backwards compatible.</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L143'>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> e_phoff = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L141'>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> e_phoff = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Comment">// unused: e_shoff</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Comment">// unused: e_flags</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L147'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </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#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L147'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L147'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L204'>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#L99'>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="L51" class="LineNr"> 51 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L145'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </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#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L145'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L145'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L99'>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>  <span class="Comment">// unused: e_shentsize</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// unused: e_shnum</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// unused: e_shstrndx</span>
@@ -121,25 +121,25 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span>    <a href='012elf.cc.html#L96'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> i<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">,</span> overlap<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment">// initialize code and stack</span>
-<span id="L65" class="LineNr"> 65 </span>  assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L139'>STACK_SEGMENT</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='012elf.cc.html#L139'>STACK_SEGMENT</a><span class="Delimiter">));</span>
-<span id="L67" class="LineNr"> 67 </span>  assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L140'>AFTER_STACK</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L68" class="LineNr"> 68 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L140'>AFTER_STACK</a><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L137'>STACK_SEGMENT</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='012elf.cc.html#L137'>STACK_SEGMENT</a><span class="Delimiter">));</span>
+<span id="L67" class="LineNr"> 67 </span>  assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L138'>AFTER_STACK</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L68" class="LineNr"> 68 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L138'>AFTER_STACK</a><span class="Delimiter">;</span>
 <span id="L69" class="LineNr"> 69 </span>  Reg[EBP]<span class="Delimiter">.</span>u = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L70" class="LineNr"> 70 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = e_entry<span class="Delimiter">;</span>
 <span id="L71" class="LineNr"> 71 </span>
 <span id="L72" class="LineNr"> 72 </span>  <span class="Comment">// initialize args on stack</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Comment">// no envp for now</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Comment">// we wastefully use a separate page of memory for argv</span>
-<span id="L75" class="LineNr"> 75 </span>  <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='012elf.cc.html#L141'>ARGV_DATA_SEGMENT</a><span class="Delimiter">));</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">uint32_t</span> argv_data = <a href='012elf.cc.html#L141'>ARGV_DATA_SEGMENT</a><span class="Delimiter">;</span>
+<span id="L75" class="LineNr"> 75 </span>  <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a><span class="Delimiter">));</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">uint32_t</span> argv_data = <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a><span class="Delimiter">;</span>
 <span id="L77" class="LineNr"> 77 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = argc-<span class="Constant">1</span><span class="Delimiter">;</span>  i &gt;= <span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  --i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L78" class="LineNr"> 78 </span>    <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>argv_data<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> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt;= strlen<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L80" class="LineNr"> 80 </span>      assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>argv_data<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>  <span class="Comment">// don't bother comparing ARGV and STACK</span>
-<span id="L81" class="LineNr"> 81 </span>      <a href='010---vm.cc.html#L225'>write_mem_u8</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>      <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span>
 <span id="L82" class="LineNr"> 82 </span>      argv_data += <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">char</span><span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>      assert<span class="Delimiter">(</span>argv_data &lt; <a href='012elf.cc.html#L141'>ARGV_DATA_SEGMENT</a> + <a href='012elf.cc.html#L135'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>      assert<span class="Delimiter">(</span>argv_data &lt; <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a> + <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><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>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>argc-<span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -147,90 +147,88 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L90" class="LineNr"> 90 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L93" class="LineNr"> 93 </span>  <a href='010---vm.cc.html#L233'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='010---vm.cc.html#L262'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
 <span id="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='012elf.cc.html#L96'>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">uint32_t</span> p_type = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L204'>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="L97" class="LineNr"> 97 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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>  <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="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L204'>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="L100" class="LineNr">100 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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>    <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="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L99'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L161'>die</a><span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L99'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L159'>die</a><span class="Delimiter">();</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Comment">// unused: p_paddr</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
-<span id="L110" class="LineNr">110 </span>    <a href='003trace.cc.html#L211'>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>)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>    <a href='003trace.cc.html#L210'>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>)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L111" class="LineNr">111 </span>
 <span id="L112" class="LineNr">112 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
-<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L211'>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#L161'>die</a><span class="Delimiter">();</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_memsz &gt; <a href='010---vm.cc.html#L93'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Code segment too small for SubX; for now please manually increase INITIAL_SEGMENT_SIZE.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>    <a href='003trace.cc.html#L210'>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#L159'>die</a><span class="Delimiter">();</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_memsz &gt;= <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;Code segment too small for SubX; for now please manually increase INITIAL_SEGMENT_SIZE.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L116" class="LineNr">116 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L117" class="LineNr">117 </span>  <span class="Delimiter">}</span>
-<span id="L118" class="LineNr">118 </span>  <a href='003trace.cc.html#L204'>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="L118" class="LineNr">118 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;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>  <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="L120" class="LineNr">120 </span>  <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>p_vaddr<span class="Delimiter">));</span>
+<span id="L120" class="LineNr">120 </span>  <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>p_vaddr<span class="Delimiter">));</span>
 <span id="L121" class="LineNr">121 </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>
 <span id="L122" class="LineNr">122 </span>    assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L123" class="LineNr">123 </span>    <a href='010---vm.cc.html#L225'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>    <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
 <span id="L124" class="LineNr">124 </span>    overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">);</span>
 <span id="L125" class="LineNr">125 </span>  <span class="Delimiter">}</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>segment_index == <span class="Constant">0</span> &amp;&amp; <a href='010---vm.cc.html#L163'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
-<span id="L127" class="LineNr">127 </span>    <a href='010---vm.cc.html#L163'>End_of_program</a> = p_vaddr+p_memsz<span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>segment_index == <span class="Constant">0</span> &amp;&amp; <a href='010---vm.cc.html#L185'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
+<span id="L127" class="LineNr">127 </span>    <a href='010---vm.cc.html#L185'>End_of_program</a> = p_vaddr+p_memsz<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="Delimiter">:(before &quot;End Includes&quot;)</span>
 <span id="L131" class="LineNr">131 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now.</span>
-<span id="L132" class="LineNr">132 </span><span class="Comment">//   code: 0x08048000 -&gt; 0x08048fff</span>
-<span id="L133" class="LineNr">133 </span><span class="Comment">//   data/heap: 0x08050000 -&gt; 0x08050fff</span>
-<span id="L134" class="LineNr">134 </span><span class="Comment">//   stack: 0x08060fff -&gt; 0x08060000 (downward)</span>
-<span id="L135" class="LineNr">135 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L135'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L136'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L137'>DATA_SEGMENT</a> = <span class="Constant">0x08050000</span><span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L138'>HEAP_SEGMENT</a> = <a href='012elf.cc.html#L137'>DATA_SEGMENT</a><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L139'>STACK_SEGMENT</a> = <span class="Constant">0x08060000</span><span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L140'>AFTER_STACK</a> = <span class="Constant">0x08060ffc</span><span class="Delimiter">;</span>  <span class="Comment">// forget final word because of the off-by-one with INITIAL_SEGMENT_SIZE;</span>
-<span id="L141" class="LineNr">141 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L141'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x08070000</span><span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span><span class="Delimiter">:(code)</span>
-<span id="L143" class="LineNr">143 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L143'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
-<span id="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="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L147'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
-<span id="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="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L152" class="LineNr">152 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L152'>perr</a> <span class="Delimiter">{};</span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(code)</span>
-<span id="L154" class="LineNr">154 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L152'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
-<span id="L156" class="LineNr">156 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Identifier">return</span> os<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 Types&quot;)</span>
-<span id="L161" class="LineNr">161 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L161'>die</a> <span class="Delimiter">{};</span>
-<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(code)</span>
-<span id="L163" class="LineNr">163 </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#L161'>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="L164" class="LineNr">164 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L165" class="LineNr">165 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">}</span>
-<span id="L167" class="LineNr">167 </span>
-<span id="L168" class="LineNr">168 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L169" class="LineNr">169 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
-<span id="L170" class="LineNr">170 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
-<span id="L171" class="LineNr">171 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
-<span id="L172" class="LineNr">172 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
-<span id="L173" class="LineNr">173 </span><span class="Comment">#include &lt;errno.h&gt;</span>
-<span id="L174" class="LineNr">174 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
+<span id="L132" class="LineNr">132 </span><span class="Comment">//   code: 0x09000000 -&gt; 0x09ffffff</span>
+<span id="L133" class="LineNr">133 </span><span class="Comment">//   data/heap: 0x0a000000 -&gt; 0x0affffff</span>
+<span id="L134" class="LineNr">134 </span><span class="Comment">//   stack: 0x0b000ffc -&gt; 0x0b000000 (downward)</span>
+<span id="L135" class="LineNr">135 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L135'>CODE_SEGMENT</a> = <span class="Constant">0x09000000</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L136'>DATA_SEGMENT</a> = <span class="Constant">0x0a000000</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L137'>STACK_SEGMENT</a> = <span class="Constant">0x0b000000</span><span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L138'>AFTER_STACK</a> = <span class="Constant">0x0b000ffc</span><span class="Delimiter">;</span>  <span class="Comment">// forget final word because of the off-by-one with INITIAL_SEGMENT_SIZE;</span>
+<span id="L139" class="LineNr">139 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x0c000000</span><span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(code)</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L141'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L142" class="LineNr">142 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">}</span>
+<span id="L144" class="LineNr">144 </span>
+<span id="L145" class="LineNr">145 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L145'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
+<span id="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="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L150" class="LineNr">150 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L150'>perr</a> <span class="Delimiter">{};</span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">:(code)</span>
+<span id="L152" class="LineNr">152 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L150'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
+<span id="L154" class="LineNr">154 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
+<span id="L157" class="LineNr">157 </span>
+<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L159" class="LineNr">159 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L159'>die</a> <span class="Delimiter">{};</span>
+<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(code)</span>
+<span id="L161" class="LineNr">161 </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#L159'>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="L162" class="LineNr">162 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
+<span id="L163" class="LineNr">163 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</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 Includes&quot;)</span>
+<span id="L167" class="LineNr">167 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
+<span id="L168" class="LineNr">168 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
+<span id="L169" class="LineNr">169 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
+<span id="L170" class="LineNr">170 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
+<span id="L171" class="LineNr">171 </span><span class="Comment">#include &lt;errno.h&gt;</span>
+<span id="L172" class="LineNr">172 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 173e04e2..41873b00 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -65,8 +65,8 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <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(name)&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add r32 to rm32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -81,11 +81,11 @@ if ('onhashchange' in window) {
 <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#L322'>next</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; 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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="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> Reg[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>
@@ -94,30 +94,30 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</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">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L37" class="LineNr"> 37 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;r/m32 is &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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;Reg[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#L217'>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="L40" class="LineNr"> 40 </span>  <span class="Identifier">return</span> <a href='010---vm.cc.html#L239'>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">uint8_t</span> mod = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">6</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">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</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#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;unexpected direct addressing mode</span><span class="cSpecial">\n</span><span class="Constant">&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#L370'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</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#L405'>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>
@@ -134,14 +134,14 @@ if ('onhashchange' in window) {
 <span id="L69" class="LineNr"> 69 </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="L70" class="LineNr"> 70 </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="L71" class="LineNr"> 71 </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="L72" class="LineNr"> 72 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L211'>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="L72" class="LineNr"> 72 </span>  <span class="Normal">default</span>: <a href='003trace.cc.html#L210'>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="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="SalientComment">//:: subtract</span>
 <span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L79" class="LineNr"> 79 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract r32 from rm32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L80" class="LineNr"> 80 </span>
 <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
 <span id="L82" class="LineNr"> 82 </span><span class="Special">% Reg[EAX].i = 10;</span>
@@ -156,18 +156,18 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L93" class="LineNr"> 93 </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="L94" class="LineNr"> 94 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </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="L96" class="LineNr"> 96 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </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="L96" class="LineNr"> 96 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </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> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Identifier">break</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="SalientComment">//:: multiply</span>
 <span id="L103" class="LineNr">103 </span>
-<span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L105" class="LineNr">105 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;test/negate/mul/div rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L105" class="LineNr">105 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L106" class="LineNr">106 </span>
 <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(scenario multiply_eax_by_r32)</span>
 <span id="L108" class="LineNr">108 </span><span class="Special">% Reg[EAX].i = 4;</span>
@@ -183,23 +183,23 @@ if ('onhashchange' in window) {
 <span id="L118" class="LineNr">118 </span>
 <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L122" class="LineNr">122 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L122" class="LineNr">122 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;operate on r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </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="L124" class="LineNr">124 </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="L125" class="LineNr">125 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L126" class="LineNr">126 </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="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L128" class="LineNr">128 </span>    <span class="Normal">uint64_t</span> result = Reg[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="L127" class="LineNr">127 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Normal">const</span> <span class="Normal">uint64_t</span> result = Reg[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="L129" class="LineNr">129 </span>    Reg[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
 <span id="L130" class="LineNr">130 </span>    Reg[EDX]<span class="Delimiter">.</span>u = result &gt;&gt; <span class="Constant">32</span><span class="Delimiter">;</span>
-<span id="L131" class="LineNr">131 </span>    <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L131" class="LineNr">131 </span>    <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L133" class="LineNr">133 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L134" class="LineNr">134 </span>  <span class="Delimiter">}</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Comment">// End Op f7 Subops</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">default</span>:
-<span id="L137" class="LineNr">137 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
 <span id="L140" class="LineNr">140 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -207,8 +207,8 @@ if ('onhashchange' in window) {
 <span id="L142" class="LineNr">142 </span>
 <span id="L143" class="LineNr">143 </span><span class="Comment">//:</span>
 <span id="L144" class="LineNr">144 </span>
-<span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L146" class="LineNr">146 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><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="L147" class="LineNr">147 </span>
 <span id="L148" class="LineNr">148 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
 <span id="L149" class="LineNr">149 </span><span class="Special">% Reg[EAX].i = 4;</span>
@@ -223,18 +223,18 @@ if ('onhashchange' in window) {
 <span id="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L162" class="LineNr">162 </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="L163" class="LineNr">163 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L164" class="LineNr">164 </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="L165" class="LineNr">165 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L162" class="LineNr">162 </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="L163" class="LineNr">163 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L164" class="LineNr">164 </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="L165" class="LineNr">165 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
 <span id="L166" class="LineNr">166 </span>  <span class="Identifier">break</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="SalientComment">//:: and</span>
 <span id="L170" class="LineNr">170 </span>
-<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L172" class="LineNr">172 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L172" class="LineNr">172 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L173" class="LineNr">173 </span>
 <span id="L174" class="LineNr">174 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
 <span id="L175" class="LineNr">175 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -249,18 +249,18 @@ if ('onhashchange' in window) {
 <span id="L184" class="LineNr">184 </span>
 <span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L186" class="LineNr">186 </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="L187" class="LineNr">187 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L188" class="LineNr">188 </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="L189" class="LineNr">189 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L188" class="LineNr">188 </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="L189" class="LineNr">189 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L190" class="LineNr">190 </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="L191" class="LineNr">191 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </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> Reg[arg2]<span class="Delimiter">.</span>u<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">//:: or</span>
 <span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
 <span id="L201" class="LineNr">201 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -275,18 +275,18 @@ if ('onhashchange' in window) {
 <span id="L210" class="LineNr">210 </span>
 <span id="L211" class="LineNr">211 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L212" class="LineNr">212 </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="L213" class="LineNr">213 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L214" class="LineNr">214 </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="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L214" class="LineNr">214 </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="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L216" class="LineNr">216 </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="L217" class="LineNr">217 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </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> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L218" class="LineNr">218 </span>  <span class="Identifier">break</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="SalientComment">//:: xor</span>
 <span id="L222" class="LineNr">222 </span>
-<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L224" class="LineNr">224 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</span>
+<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L224" class="LineNr">224 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L225" class="LineNr">225 </span>
 <span id="L226" class="LineNr">226 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
 <span id="L227" class="LineNr">227 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
@@ -301,360 +301,357 @@ if ('onhashchange' in window) {
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L238" class="LineNr">238 </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="L239" class="LineNr">239 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L242" class="LineNr">242 </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="L243" class="LineNr">243 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L243" class="LineNr">243 </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> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span>
 <span id="L246" class="LineNr">246 </span>
 <span id="L247" class="LineNr">247 </span><span class="SalientComment">//:: not</span>
 <span id="L248" class="LineNr">248 </span>
-<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L250" class="LineNr">250 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;bitwise complement of rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L253" class="LineNr">253 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
-<span id="L254" class="LineNr">254 </span>== <span class="Constant">0x1</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>  f7  d3                                      <span class="Comment"># not EBX</span>
-<span id="L257" class="LineNr">257 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
-<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: operate on r/m32</span>
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: subop: not</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L262" class="LineNr">262 </span>
-<span id="L263" class="LineNr">263 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
-<span id="L264" class="LineNr">264 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
-<span id="L265" class="LineNr">265 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L266" class="LineNr">266 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L267" class="LineNr">267 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L268" class="LineNr">268 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L269" class="LineNr">269 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L270" class="LineNr">270 </span>  <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span><span class="Delimiter">}</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(scenario not_r32)</span>
+<span id="L250" class="LineNr">250 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
+<span id="L251" class="LineNr">251 </span>== <span class="Constant">0x1</span>
+<span id="L252" class="LineNr">252 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L253" class="LineNr">253 </span>  f7  d3                                      <span class="Comment"># not EBX</span>
+<span id="L254" class="LineNr">254 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L256" class="LineNr">256 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L257" class="LineNr">257 </span><span class="traceContains">+run: subop: not</span>
+<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
+<span id="L259" class="LineNr">259 </span>
+<span id="L260" class="LineNr">260 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
+<span id="L261" class="LineNr">261 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
+<span id="L262" class="LineNr">262 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop: not&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L263" class="LineNr">263 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L264" class="LineNr">264 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L265" class="LineNr">265 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span>  <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span>
+<span id="L270" class="LineNr">270 </span>
+<span id="L271" class="LineNr">271 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L274" class="LineNr">274 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L277" class="LineNr">277 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</span>
-<span id="L278" class="LineNr">278 </span>
-<span id="L279" class="LineNr">279 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L280" class="LineNr">280 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L281" class="LineNr">281 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L282" class="LineNr">282 </span>== <span class="Constant">0x1</span>
-<span id="L283" class="LineNr">283 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L285" class="LineNr">285 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L286" class="LineNr">286 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L287" class="LineNr">287 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L288" class="LineNr">288 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L289" class="LineNr">289 </span>
-<span id="L290" class="LineNr">290 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L291" class="LineNr">291 </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="L292" class="LineNr">292 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L293" class="LineNr">293 </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="L294" class="LineNr">294 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L295" class="LineNr">295 </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="L296" class="LineNr">296 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L299" class="LineNr">299 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L301" class="LineNr">301 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L302" class="LineNr">302 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Identifier">break</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="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L307" class="LineNr">307 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
-<span id="L308" class="LineNr">308 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L309" class="LineNr">309 </span>== <span class="Constant">0x1</span>
-<span id="L310" class="LineNr">310 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L312" class="LineNr">312 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L318" class="LineNr">318 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L320" class="LineNr">320 </span>== <span class="Constant">0x1</span>
-<span id="L321" class="LineNr">321 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L323" class="LineNr">323 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L327" class="LineNr">327 </span>
-<span id="L328" class="LineNr">328 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
+<span id="L277" class="LineNr">277 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L278" class="LineNr">278 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</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">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L282" class="LineNr">282 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L283" class="LineNr">283 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L284" class="LineNr">284 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L285" class="LineNr">285 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L286" class="LineNr">286 </span>
+<span id="L287" class="LineNr">287 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L288" class="LineNr">288 </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="L289" class="LineNr">289 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L290" class="LineNr">290 </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="L291" class="LineNr">291 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L292" class="LineNr">292 </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="L293" class="LineNr">293 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L295" class="LineNr">295 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L297" class="LineNr">297 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L299" class="LineNr">299 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Identifier">break</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="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
+<span id="L304" class="LineNr">304 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
+<span id="L305" class="LineNr">305 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L306" class="LineNr">306 </span>== <span class="Constant">0x1</span>
+<span id="L307" class="LineNr">307 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L309" class="LineNr">309 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L310" class="LineNr">310 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L311" class="LineNr">311 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L313" class="LineNr">313 </span>
+<span id="L314" class="LineNr">314 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
+<span id="L315" class="LineNr">315 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L316" class="LineNr">316 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L317" class="LineNr">317 </span>== <span class="Constant">0x1</span>
+<span id="L318" class="LineNr">318 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L319" class="LineNr">319 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L320" class="LineNr">320 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L321" class="LineNr">321 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L322" class="LineNr">322 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L324" class="LineNr">324 </span>
+<span id="L325" class="LineNr">325 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L326" class="LineNr">326 </span>
+<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L328" class="LineNr">328 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L331" class="LineNr">331 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L334" class="LineNr">334 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L335" class="LineNr">335 </span>== <span class="Constant">0x1</span>
-<span id="L336" class="LineNr">336 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L337" class="LineNr">337 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
-<span id="L338" class="LineNr">338 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L339" class="LineNr">339 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L341" class="LineNr">341 </span><span class="traceContains">+run: storing 0x000000af</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">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L348" class="LineNr">348 </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="L349" class="LineNr">349 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L350" class="LineNr">350 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Identifier">break</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="SalientComment">//:: xchg</span>
+<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
+<span id="L331" class="LineNr">331 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L332" class="LineNr">332 </span>== <span class="Constant">0x1</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">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
+<span id="L335" class="LineNr">335 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L336" class="LineNr">336 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L337" class="LineNr">337 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L338" class="LineNr">338 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L339" class="LineNr">339 </span>
+<span id="L340" class="LineNr">340 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L341" class="LineNr">341 </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="L342" class="LineNr">342 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L343" class="LineNr">343 </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="L344" class="LineNr">344 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L345" class="LineNr">345 </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="L346" class="LineNr">346 </span>  *dest = Reg[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; *dest &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>
+<span id="L351" class="LineNr">351 </span><span class="SalientComment">//:: xchg</span>
+<span id="L352" class="LineNr">352 </span>
+<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L354" class="LineNr">354 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32 (xchg)&quot;</span><span class="Delimiter">);</span>
 <span id="L355" class="LineNr">355 </span>
-<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L357" class="LineNr">357 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
-<span id="L360" class="LineNr">360 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L361" class="LineNr">361 </span><span class="Special">% Reg[EAX].i = 0x2e;</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>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L365" class="LineNr">365 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L366" class="LineNr">366 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L372" class="LineNr">372 </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="L373" class="LineNr">373 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L376" class="LineNr">376 </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="L377" class="LineNr">377 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L378" class="LineNr">378 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L379" class="LineNr">379 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L380" class="LineNr">380 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>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="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="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">//:: increment</span>
-<span id="L386" class="LineNr">386 </span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L388" class="LineNr">388 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L390" class="LineNr">390 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L391" class="LineNr">391 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L392" class="LineNr">392 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L393" class="LineNr">393 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L394" class="LineNr">394 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L395" class="LineNr">395 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;increment R7 (EDI)&quot;</span><span class="Delimiter">);</span>
-<span id="L396" class="LineNr">396 </span>
-<span id="L397" class="LineNr">397 </span><span class="Delimiter">:(scenario increment_r32)</span>
-<span id="L398" class="LineNr">398 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L399" class="LineNr">399 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L400" class="LineNr">400 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L401" class="LineNr">401 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
-<span id="L402" class="LineNr">402 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L403" class="LineNr">403 </span><span class="traceContains">+run: storing value 0x00000020</span>
-<span id="L404" class="LineNr">404 </span>
-<span id="L405" class="LineNr">405 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L406" class="LineNr">406 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
-<span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
-<span id="L408" class="LineNr">408 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
-<span id="L409" class="LineNr">409 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
-<span id="L410" class="LineNr">410 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
-<span id="L411" class="LineNr">411 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
-<span id="L412" class="LineNr">412 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
-<span id="L413" class="LineNr">413 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
-<span id="L414" class="LineNr">414 </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="L415" class="LineNr">415 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L416" class="LineNr">416 </span>  ++Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L417" class="LineNr">417 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L418" class="LineNr">418 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L419" class="LineNr">419 </span><span class="Delimiter">}</span>
+<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
+<span id="L357" class="LineNr">357 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L358" class="LineNr">358 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
+<span id="L359" class="LineNr">359 </span>== <span class="Constant">0x1</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">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
+<span id="L362" class="LineNr">362 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L363" class="LineNr">363 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L364" class="LineNr">364 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L365" class="LineNr">365 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
+<span id="L366" class="LineNr">366 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L367" class="LineNr">367 </span>
+<span id="L368" class="LineNr">368 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L369" class="LineNr">369 </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="L370" class="LineNr">370 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L371" class="LineNr">371 </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="L372" class="LineNr">372 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L373" class="LineNr">373 </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="L374" class="LineNr">374 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
+<span id="L375" class="LineNr">375 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L376" class="LineNr">376 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
+<span id="L377" class="LineNr">377 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">}</span>
+<span id="L381" class="LineNr">381 </span>
+<span id="L382" class="LineNr">382 </span><span class="SalientComment">//:: increment</span>
+<span id="L383" class="LineNr">383 </span>
+<span id="L384" class="LineNr">384 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L385" class="LineNr">385 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L386" class="LineNr">386 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L387" class="LineNr">387 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L388" class="LineNr">388 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L389" class="LineNr">389 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L390" class="LineNr">390 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L391" class="LineNr">391 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L392" class="LineNr">392 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span><span class="Delimiter">:(scenario increment_r32)</span>
+<span id="L395" class="LineNr">395 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
+<span id="L396" class="LineNr">396 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L397" class="LineNr">397 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L398" class="LineNr">398 </span>  <span class="Constant">41</span>                                          <span class="Comment"># increment ECX</span>
+<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: storing value 0x00000020</span>
+<span id="L401" class="LineNr">401 </span>
+<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x40</span>:
+<span id="L404" class="LineNr">404 </span><span class="Normal">case</span> <span class="Constant">0x41</span>:
+<span id="L405" class="LineNr">405 </span><span class="Normal">case</span> <span class="Constant">0x42</span>:
+<span id="L406" class="LineNr">406 </span><span class="Normal">case</span> <span class="Constant">0x43</span>:
+<span id="L407" class="LineNr">407 </span><span class="Normal">case</span> <span class="Constant">0x44</span>:
+<span id="L408" class="LineNr">408 </span><span class="Normal">case</span> <span class="Constant">0x45</span>:
+<span id="L409" class="LineNr">409 </span><span class="Normal">case</span> <span class="Constant">0x46</span>:
+<span id="L410" class="LineNr">410 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r32</span>
+<span id="L411" class="LineNr">411 </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="L412" class="LineNr">412 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L413" class="LineNr">413 </span>  ++Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L414" class="LineNr">414 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L415" class="LineNr">415 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">}</span>
+<span id="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L420" class="LineNr">420 </span>
-<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;inc/dec/jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
-<span id="L423" class="LineNr">423 </span>
-<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenario increment_rm32)</span>
-<span id="L425" class="LineNr">425 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L427" class="LineNr">427 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L428" class="LineNr">428 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
-<span id="L429" class="LineNr">429 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
-<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: increment r/m32</span>
-<span id="L431" class="LineNr">431 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L432" class="LineNr">432 </span><span class="traceContains">+run: storing value 0x00000021</span>
-<span id="L433" class="LineNr">433 </span>
-<span id="L434" class="LineNr">434 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L435" class="LineNr">435 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L437" class="LineNr">437 </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="L438" class="LineNr">438 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L439" class="LineNr">439 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
-<span id="L440" class="LineNr">440 </span>      <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L441" class="LineNr">441 </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="L442" class="LineNr">442 </span>      ++*arg<span class="Delimiter">;</span>
-<span id="L443" class="LineNr">443 </span>      <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L444" class="LineNr">444 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L445" class="LineNr">445 </span>    <span class="Delimiter">}</span>
-<span id="L446" class="LineNr">446 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Delimiter">}</span>
-<span id="L448" class="LineNr">448 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L449" class="LineNr">449 </span><span class="Delimiter">}</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="SalientComment">//:: decrement</span>
-<span id="L452" class="LineNr">452 </span>
-<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L454" class="LineNr">454 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L455" class="LineNr">455 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L456" class="LineNr">456 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L457" class="LineNr">457 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L458" class="LineNr">458 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L459" class="LineNr">459 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L460" class="LineNr">460 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L461" class="LineNr">461 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;decrement R7 (EDI)&quot;</span><span class="Delimiter">);</span>
-<span id="L462" class="LineNr">462 </span>
-<span id="L463" class="LineNr">463 </span><span class="Delimiter">:(scenario decrement_r32)</span>
-<span id="L464" class="LineNr">464 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
-<span id="L465" class="LineNr">465 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L466" class="LineNr">466 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
-<span id="L468" class="LineNr">468 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
-<span id="L469" class="LineNr">469 </span><span class="traceContains">+run: storing value 0x0000001e</span>
-<span id="L470" class="LineNr">470 </span>
-<span id="L471" class="LineNr">471 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L472" class="LineNr">472 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
-<span id="L473" class="LineNr">473 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
-<span id="L474" class="LineNr">474 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
-<span id="L475" class="LineNr">475 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
-<span id="L476" class="LineNr">476 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
-<span id="L477" class="LineNr">477 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
-<span id="L478" class="LineNr">478 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
-<span id="L479" class="LineNr">479 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
-<span id="L480" class="LineNr">480 </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="L481" class="LineNr">481 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L482" class="LineNr">482 </span>  --Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L483" class="LineNr">483 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L484" class="LineNr">484 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">}</span>
-<span id="L486" class="LineNr">486 </span>
-<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(scenario decrement_rm32)</span>
-<span id="L488" class="LineNr">488 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
-<span id="L489" class="LineNr">489 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L490" class="LineNr">490 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L491" class="LineNr">491 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
-<span id="L492" class="LineNr">492 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
-<span id="L493" class="LineNr">493 </span><span class="traceContains">+run: decrement r/m32</span>
-<span id="L494" class="LineNr">494 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L495" class="LineNr">495 </span><span class="traceContains">+run: storing value 0x0000001f</span>
-<span id="L496" class="LineNr">496 </span>
-<span id="L497" class="LineNr">497 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L498" class="LineNr">498 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
-<span id="L499" class="LineNr">499 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L500" class="LineNr">500 </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="L501" class="LineNr">501 </span>  --*arg<span class="Delimiter">;</span>
-<span id="L502" class="LineNr">502 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L503" class="LineNr">503 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L504" class="LineNr">504 </span><span class="Delimiter">}</span>
-<span id="L505" class="LineNr">505 </span>
-<span id="L506" class="LineNr">506 </span><span class="SalientComment">//:: push</span>
-<span id="L507" class="LineNr">507 </span>
-<span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L509" class="LineNr">509 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R0 (EAX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L510" class="LineNr">510 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R1 (ECX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L511" class="LineNr">511 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R2 (EDX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R3 (EBX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R4 (ESP) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R5 (EBP) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R6 (ESI) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R7 (EDI) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L517" class="LineNr">517 </span>
-<span id="L518" class="LineNr">518 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L519" class="LineNr">519 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L520" class="LineNr">520 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L521" class="LineNr">521 </span>== <span class="Constant">0x1</span>
-<span id="L522" class="LineNr">522 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L523" class="LineNr">523 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L524" class="LineNr">524 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L525" class="LineNr">525 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L526" class="LineNr">526 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L527" class="LineNr">527 </span>
-<span id="L528" class="LineNr">528 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L529" class="LineNr">529 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L530" class="LineNr">530 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L531" class="LineNr">531 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L532" class="LineNr">532 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L533" class="LineNr">533 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L534" class="LineNr">534 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L535" class="LineNr">535 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L536" class="LineNr">536 </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="L537" class="LineNr">537 </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="L538" class="LineNr">538 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L539" class="LineNr">539 </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="L540" class="LineNr">540 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L541" class="LineNr">541 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L542" class="LineNr">542 </span><span class="Delimiter">}</span>
-<span id="L543" class="LineNr">543 </span>
-<span id="L544" class="LineNr">544 </span><span class="SalientComment">//:: pop</span>
-<span id="L545" class="LineNr">545 </span>
-<span id="L546" class="LineNr">546 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L547" class="LineNr">547 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L548" class="LineNr">548 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L549" class="LineNr">549 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L550" class="LineNr">550 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L551" class="LineNr">551 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L552" class="LineNr">552 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L553" class="LineNr">553 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L554" class="LineNr">554 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
-<span id="L555" class="LineNr">555 </span>
-<span id="L556" class="LineNr">556 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L557" class="LineNr">557 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
-<span id="L558" class="LineNr">558 </span><span class="Special">% Mem.push_back(vma(0x2000));  // manually allocate memory</span>
-<span id="L559" class="LineNr">559 </span><span class="Special">% write_mem_i32(0x2000, 0x0000000a);  // ..before this write</span>
-<span id="L560" class="LineNr">560 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L561" class="LineNr">561 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L562" class="LineNr">562 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L563" class="LineNr">563 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L564" class="LineNr">564 </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="L565" class="LineNr">565 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L586'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L566" class="LineNr">566 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L567" class="LineNr">567 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span>
-<span id="L568" class="LineNr">568 </span>
-<span id="L569" class="LineNr">569 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L570" class="LineNr">570 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L571" class="LineNr">571 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L572" class="LineNr">572 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L573" class="LineNr">573 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L574" class="LineNr">574 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L575" class="LineNr">575 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L576" class="LineNr">576 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L577" class="LineNr">577 </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="L578" class="LineNr">578 </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="L579" class="LineNr">579 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L580" class="LineNr">580 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L581" class="LineNr">581 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L586'>pop</a><span class="Delimiter">();</span>
-<span id="L582" class="LineNr">582 </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="L583" class="LineNr">583 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L584" class="LineNr">584 </span><span class="Delimiter">}</span>
-<span id="L585" class="LineNr">585 </span><span class="Delimiter">:(code)</span>
-<span id="L586" class="LineNr">586 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L586'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L587" class="LineNr">587 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L178'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L588" class="LineNr">588 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L589" class="LineNr">589 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L590" class="LineNr">590 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L591" class="LineNr">591 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L592" class="LineNr">592 </span><span class="Delimiter">}</span>
+<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(scenario increment_rm32)</span>
+<span id="L422" class="LineNr">422 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
+<span id="L423" class="LineNr">423 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L424" class="LineNr">424 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L425" class="LineNr">425 </span>  ff  c0                                      <span class="Comment"># increment EAX</span>
+<span id="L426" class="LineNr">426 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span>
+<span id="L427" class="LineNr">427 </span><span class="traceContains">+run: increment r/m32</span>
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: storing value 0x00000021</span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L432" class="LineNr">432 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
+<span id="L433" class="LineNr">433 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L434" class="LineNr">434 </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="L435" class="LineNr">435 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L436" class="LineNr">436 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>  <span class="Comment">// increment r/m32</span>
+<span id="L437" class="LineNr">437 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;increment r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L438" class="LineNr">438 </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="L439" class="LineNr">439 </span>      ++*arg<span class="Delimiter">;</span>
+<span id="L440" class="LineNr">440 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span>    <span class="Delimiter">}</span>
+<span id="L443" class="LineNr">443 </span>    <span class="Comment">// End Op ff Subops</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
+<span id="L445" class="LineNr">445 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L446" class="LineNr">446 </span><span class="Delimiter">}</span>
+<span id="L447" class="LineNr">447 </span>
+<span id="L448" class="LineNr">448 </span><span class="SalientComment">//:: decrement</span>
+<span id="L449" class="LineNr">449 </span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L451" class="LineNr">451 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L452" class="LineNr">452 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L453" class="LineNr">453 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L454" class="LineNr">454 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L455" class="LineNr">455 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L456" class="LineNr">456 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L457" class="LineNr">457 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L458" class="LineNr">458 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L459" class="LineNr">459 </span>
+<span id="L460" class="LineNr">460 </span><span class="Delimiter">:(scenario decrement_r32)</span>
+<span id="L461" class="LineNr">461 </span><span class="Special">% Reg[ECX].u = 0x1f;</span>
+<span id="L462" class="LineNr">462 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L463" class="LineNr">463 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Constant">49</span>                                          <span class="Comment"># decrement ECX</span>
+<span id="L465" class="LineNr">465 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L466" class="LineNr">466 </span><span class="traceContains">+run: storing value 0x0000001e</span>
+<span id="L467" class="LineNr">467 </span>
+<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L469" class="LineNr">469 </span><span class="Normal">case</span> <span class="Constant">0x48</span>:
+<span id="L470" class="LineNr">470 </span><span class="Normal">case</span> <span class="Constant">0x49</span>:
+<span id="L471" class="LineNr">471 </span><span class="Normal">case</span> <span class="Constant">0x4a</span>:
+<span id="L472" class="LineNr">472 </span><span class="Normal">case</span> <span class="Constant">0x4b</span>:
+<span id="L473" class="LineNr">473 </span><span class="Normal">case</span> <span class="Constant">0x4c</span>:
+<span id="L474" class="LineNr">474 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>:
+<span id="L475" class="LineNr">475 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>:
+<span id="L476" class="LineNr">476 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r32</span>
+<span id="L477" class="LineNr">477 </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="L478" class="LineNr">478 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L479" class="LineNr">479 </span>  --Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L480" class="LineNr">480 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[reg]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L481" class="LineNr">481 </span>  <span class="Identifier">break</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">:(scenario decrement_rm32)</span>
+<span id="L485" class="LineNr">485 </span><span class="Special">% Reg[EAX].u = 0x20;</span>
+<span id="L486" class="LineNr">486 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L487" class="LineNr">487 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L488" class="LineNr">488 </span>  ff  c8                                      <span class="Comment"># decrement EAX</span>
+<span id="L489" class="LineNr">489 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span>
+<span id="L490" class="LineNr">490 </span><span class="traceContains">+run: decrement r/m32</span>
+<span id="L491" class="LineNr">491 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L492" class="LineNr">492 </span><span class="traceContains">+run: storing value 0x0000001f</span>
+<span id="L493" class="LineNr">493 </span>
+<span id="L494" class="LineNr">494 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L495" class="LineNr">495 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>  <span class="Comment">// decrement r/m32</span>
+<span id="L496" class="LineNr">496 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;decrement r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L497" class="LineNr">497 </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="L498" class="LineNr">498 </span>  --*arg<span class="Delimiter">;</span>
+<span id="L499" class="LineNr">499 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; *arg &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L500" class="LineNr">500 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L501" class="LineNr">501 </span><span class="Delimiter">}</span>
+<span id="L502" class="LineNr">502 </span>
+<span id="L503" class="LineNr">503 </span><span class="SalientComment">//:: push</span>
+<span id="L504" class="LineNr">504 </span>
+<span id="L505" class="LineNr">505 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L506" class="LineNr">506 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L507" class="LineNr">507 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L508" class="LineNr">508 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L509" class="LineNr">509 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L510" class="LineNr">510 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L511" class="LineNr">511 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L512" class="LineNr">512 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L513" class="LineNr">513 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L514" class="LineNr">514 </span>
+<span id="L515" class="LineNr">515 </span><span class="Delimiter">:(scenario push_r32)</span>
+<span id="L516" class="LineNr">516 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L517" class="LineNr">517 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
+<span id="L518" class="LineNr">518 </span>== <span class="Constant">0x1</span>
+<span id="L519" class="LineNr">519 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L520" class="LineNr">520 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
+<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L523" class="LineNr">523 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
+<span id="L524" class="LineNr">524 </span>
+<span id="L525" class="LineNr">525 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L526" class="LineNr">526 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
+<span id="L527" class="LineNr">527 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
+<span id="L528" class="LineNr">528 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
+<span id="L529" class="LineNr">529 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
+<span id="L530" class="LineNr">530 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
+<span id="L531" class="LineNr">531 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
+<span id="L532" class="LineNr">532 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
+<span id="L533" class="LineNr">533 </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="L534" class="LineNr">534 </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="L535" class="LineNr">535 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L536" class="LineNr">536 </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="L537" class="LineNr">537 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<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="SalientComment">//:: pop</span>
+<span id="L542" class="LineNr">542 </span>
+<span id="L543" class="LineNr">543 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L544" class="LineNr">544 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L545" class="LineNr">545 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L546" class="LineNr">546 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L547" class="LineNr">547 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L548" class="LineNr">548 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L549" class="LineNr">549 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L550" class="LineNr">550 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L551" class="LineNr">551 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)&quot;</span><span class="Delimiter">);</span>
+<span id="L552" class="LineNr">552 </span>
+<span id="L553" class="LineNr">553 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L554" class="LineNr">554 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
+<span id="L555" class="LineNr">555 </span><span class="Special">% Mem.push_back(vma(0x2000));  // manually allocate memory</span>
+<span id="L556" class="LineNr">556 </span><span class="Special">% write_mem_i32(0x2000, 0x0000000a);  // ..before this write</span>
+<span id="L557" class="LineNr">557 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L558" class="LineNr">558 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L559" class="LineNr">559 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
+<span id="L560" class="LineNr">560 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
+<span id="L561" class="LineNr">561 </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="L562" class="LineNr">562 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L583'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L563" class="LineNr">563 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L564" class="LineNr">564 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span>
+<span id="L565" class="LineNr">565 </span>
+<span id="L566" class="LineNr">566 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L567" class="LineNr">567 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L568" class="LineNr">568 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L569" class="LineNr">569 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L570" class="LineNr">570 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L571" class="LineNr">571 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L572" class="LineNr">572 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L573" class="LineNr">573 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L574" class="LineNr">574 </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="L575" class="LineNr">575 </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="L576" class="LineNr">576 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L577" class="LineNr">577 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L578" class="LineNr">578 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L583'>pop</a><span class="Delimiter">();</span>
+<span id="L579" class="LineNr">579 </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="L580" class="LineNr">580 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L581" class="LineNr">581 </span><span class="Delimiter">}</span>
+<span id="L582" class="LineNr">582 </span><span class="Delimiter">:(code)</span>
+<span id="L583" class="LineNr">583 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L583'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L584" class="LineNr">584 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L585" class="LineNr">585 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; result &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L586" class="LineNr">586 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L587" class="LineNr">587 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L588" class="LineNr">588 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L589" class="LineNr">589 </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 61ce4216..5f934004 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -82,7 +82,7 @@ if ('onhashchange' in window) {
 <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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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="L21" class="LineNr"> 21 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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 = Reg[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>
@@ -91,8 +91,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add rm32 to r32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="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>
@@ -109,11 +109,11 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L49" class="LineNr"> 49 </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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="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>
@@ -134,8 +134,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract rm32 from r32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -152,11 +152,11 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract r/m32 from &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="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>
@@ -177,8 +177,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -195,11 +195,11 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="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> Reg[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="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
 <span id="L141" class="LineNr">141 </span>
@@ -220,8 +220,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -238,11 +238,11 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L178" class="LineNr">178 </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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L181" class="LineNr">181 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="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>
@@ -263,8 +263,8 @@ if ('onhashchange' in window) {
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Comment">//:</span>
 <span id="L201" class="LineNr">201 </span>
-<span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -281,11 +281,11 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L221" class="LineNr">221 </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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
+<span id="L224" class="LineNr">224 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span>
 <span id="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>
@@ -347,8 +347,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L287" class="LineNr">287 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -365,17 +365,17 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L305" class="LineNr">305 </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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L308" class="LineNr">308 </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">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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 = Reg[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#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L314" class="LineNr">314 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; end<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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="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>
@@ -420,8 +420,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L360" class="LineNr">360 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -437,297 +437,233 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L377" class="LineNr">377 </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="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L379" class="LineNr">379 </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="L380" class="LineNr">380 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="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>  Reg[rdest]<span class="Delimiter">.</span>i = *src<span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="Comment">//:</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">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L388" class="LineNr">388 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 (lowermost byte of r32) to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span>
-<span id="L390" class="LineNr">390 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span>
-<span id="L391" class="LineNr">391 </span><span class="Special">% Reg[EBX].i = 0x224488ab;</span>
-<span id="L392" class="LineNr">392 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L393" class="LineNr">393 </span>== <span class="Constant">0x1</span>
-<span id="L394" class="LineNr">394 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Constant">88</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy just the lowermost byte of EBX to the byte at *EAX</span>
-<span id="L396" class="LineNr">396 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L397" class="LineNr">397 </span>== <span class="Constant">0x2000</span>
-<span id="L398" class="LineNr">398 </span>f0 cc bb aa  <span class="Comment"># 0xf0 with more data in following bytes</span>
-<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: copy lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a> to r8/m8-at-r32</span>
-<span id="L400" class="LineNr">400 </span><span class="traceContains">+run: effective address is 0x2000 (EAX)</span>
-<span id="L401" class="LineNr">401 </span><span class="traceContains">+run: storing 0xab</span>
-<span id="L402" class="LineNr">402 </span><span class="Special">% CHECK_EQ(0xaabbccab, read_mem_u32(0x2000));</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: inst: 0x00000001</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 0x2000 (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: inst: 0x00000008</span>
+<span id="L402" class="LineNr">402 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
 <span id="L403" class="LineNr">403 </span>
-<span id="L404" class="LineNr">404 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L405" class="LineNr">405 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L407" class="LineNr">407 </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="L408" class="LineNr">408 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Normal">uint8_t</span>* arg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L411" class="LineNr">411 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L412" class="LineNr">412 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>*arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">}</span>
-<span id="L415" class="LineNr">415 </span>
-<span id="L416" class="LineNr">416 </span><span class="Comment">//:</span>
-<span id="L417" class="LineNr">417 </span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8 (lowermost byte of r32)&quot;</span><span class="Delimiter">);</span>
-<span id="L420" class="LineNr">420 </span>
-<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span>
-<span id="L422" class="LineNr">422 </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="L423" class="LineNr">423 </span><span class="Special">% Reg[EAX].i = 0x2000;</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>  8a  <span class="Constant">18</span>                                      <span class="Comment"># copy just the byte at *EAX to lowermost byte of EBX (clearing remaining bytes)</span>
-<span id="L427" class="LineNr">427 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
-<span id="L428" class="LineNr">428 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L429" class="LineNr">429 </span>ab ff ff ff  <span class="Comment"># 0xab with more data in following bytes</span>
-<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: copy r8/m8-at-r32 to lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L431" class="LineNr">431 </span><span class="traceContains">+run: effective address is 0x2000 (EAX)</span>
-<span id="L432" class="LineNr">432 </span><span class="traceContains">+run: storing 0xab</span>
-<span id="L433" class="LineNr">433 </span><span class="Comment"># remaining bytes of EBX are *not* cleared</span>
-<span id="L434" class="LineNr">434 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L16'>EBX</a> now contains 0xaabbccab</span>
-<span id="L435" class="LineNr">435 </span>
-<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L437" class="LineNr">437 </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="L438" class="LineNr">438 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L439" class="LineNr">439 </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="L440" class="LineNr">440 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy r8/m8-at-r32 to lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Normal">uint8_t</span>* arg2 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L443" class="LineNr">443 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>*arg2<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L444" class="LineNr">444 </span>  *<span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span>&amp;Reg[reg1]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> = *arg2<span class="Delimiter">;</span>  <span class="Comment">// assumes host is little-endian</span>
-<span id="L445" class="LineNr">445 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; now contains 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[reg1]<span class="Delimiter">.</span>u &lt;&lt; end<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">//:: jump</span>
-<span id="L450" class="LineNr">450 </span>
-<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
-<span id="L452" class="LineNr">452 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L453" class="LineNr">453 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</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>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
-<span id="L456" class="LineNr">456 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
-<span id="L457" class="LineNr">457 </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="L458" class="LineNr">458 </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="L459" class="LineNr">459 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L460" class="LineNr">460 </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="L461" class="LineNr">461 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L462" class="LineNr">462 </span><span class="traceContains">+run: jump to r/m32</span>
-<span id="L463" class="LineNr">463 </span><span class="traceContains">+run: effective address is 0x2000 (EAX)</span>
-<span id="L464" class="LineNr">464 </span><span class="traceContains">+run: jumping to 0x00000008</span>
-<span id="L465" class="LineNr">465 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L466" class="LineNr">466 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L467" class="LineNr">467 </span>
-<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L469" class="LineNr">469 </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="L470" class="LineNr">470 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L471" class="LineNr">471 </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="L472" class="LineNr">472 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L473" class="LineNr">473 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L474" class="LineNr">474 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L475" class="LineNr">475 </span><span class="Delimiter">}</span>
-<span id="L476" class="LineNr">476 </span>
-<span id="L477" class="LineNr">477 </span><span class="SalientComment">//:: push</span>
-<span id="L478" class="LineNr">478 </span>
-<span id="L479" class="LineNr">479 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
-<span id="L480" class="LineNr">480 </span><span class="Special">% Reg[EAX].i = 0x2000;</span>
-<span id="L481" class="LineNr">481 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L482" class="LineNr">482 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L483" class="LineNr">483 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L484" class="LineNr">484 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
-<span id="L485" class="LineNr">485 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
-<span id="L486" class="LineNr">486 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L487" class="LineNr">487 </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="L488" class="LineNr">488 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> r/m32</span>
-<span id="L489" class="LineNr">489 </span><span class="traceContains">+run: effective address is 0x2000 (EAX)</span>
-<span id="L490" class="LineNr">490 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span>
-<span id="L491" class="LineNr">491 </span><span class="traceContains">+run: pushing value 0x000000af</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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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>  <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
+<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &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#L89'>push</a> r/m32</span>
+<span id="L425" class="LineNr">425 </span><span class="traceContains">+run: effective address is 0x2000 (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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push 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#L89'>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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32 (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#L583'>pop</a> into r/m32</span>
+<span id="L452" class="LineNr">452 </span><span class="traceContains">+run: effective address is 0x60 (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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L463" class="LineNr">463 </span>      <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L464" class="LineNr">464 </span>      *dest = <a href='013direct_addressing.cc.html#L583'>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 0x2000 (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#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L488" class="LineNr">488 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &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">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L494" class="LineNr">494 </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="L495" class="LineNr">495 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L496" class="LineNr">496 </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="L497" class="LineNr">497 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
-<span id="L498" class="LineNr">498 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L499" class="LineNr">499 </span><span class="Delimiter">}</span>
-<span id="L500" class="LineNr">500 </span>
-<span id="L501" class="LineNr">501 </span><span class="SalientComment">//:: pop</span>
-<span id="L502" class="LineNr">502 </span>
-<span id="L503" class="LineNr">503 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L504" class="LineNr">504 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L505" class="LineNr">505 </span>
-<span id="L506" class="LineNr">506 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
-<span id="L507" class="LineNr">507 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L508" class="LineNr">508 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
-<span id="L509" class="LineNr">509 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L510" class="LineNr">510 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L511" class="LineNr">511 </span>  <span class="Constant">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX</span>
-<span id="L512" class="LineNr">512 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
-<span id="L513" class="LineNr">513 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L514" class="LineNr">514 </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="L515" class="LineNr">515 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L586'>pop</a> into r/m32</span>
-<span id="L516" class="LineNr">516 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L517" class="LineNr">517 </span><span class="traceContains">+run: popping value 0x00000030</span>
-<span id="L518" class="LineNr">518 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span>
-<span id="L519" class="LineNr">519 </span>
-<span id="L520" class="LineNr">520 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L521" class="LineNr">521 </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="L522" class="LineNr">522 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L523" class="LineNr">523 </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="L524" class="LineNr">524 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L525" class="LineNr">525 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L526" class="LineNr">526 </span>      <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;pop into r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L527" class="LineNr">527 </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="L528" class="LineNr">528 </span>      *dest = <a href='013direct_addressing.cc.html#L586'>pop</a><span class="Delimiter">();</span>
-<span id="L529" class="LineNr">529 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L530" class="LineNr">530 </span>    <span class="Delimiter">}</span>
-<span id="L531" class="LineNr">531 </span>  <span class="Delimiter">}</span>
-<span id="L532" class="LineNr">532 </span>  <span class="Identifier">break</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="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
-<span id="L536" class="LineNr">536 </span>
-<span id="L537" class="LineNr">537 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
-<span id="L538" class="LineNr">538 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L539" class="LineNr">539 </span>== <span class="Constant">0x1</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="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="L542" class="LineNr">542 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</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">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="L545" class="LineNr">545 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L546" class="LineNr">546 </span><span class="traceContains">+run: effective address is 0x2000 (disp32)</span>
-<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L548" class="LineNr">548 </span>
-<span id="L549" class="LineNr">549 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L550" class="LineNr">550 </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="L551" class="LineNr">551 </span>  addr = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L552" class="LineNr">552 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L553" class="LineNr">553 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L554" class="LineNr">554 </span>
-<span id="L555" class="LineNr">555 </span><span class="Comment">//:</span>
-<span id="L556" class="LineNr">556 </span>
-<span id="L557" class="LineNr">557 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
-<span id="L558" class="LineNr">558 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L559" class="LineNr">559 </span><span class="Special">% Reg[EAX].i = 0x1ffe;  // dest</span>
-<span id="L560" class="LineNr">560 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L561" class="LineNr">561 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L562" class="LineNr">562 </span>  <span class="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="L563" class="LineNr">563 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L564" class="LineNr">564 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L565" class="LineNr">565 </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="L566" class="LineNr">566 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L567" class="LineNr">567 </span><span class="traceContains">+run: effective address is initially 0x1ffe (EAX)</span>
-<span id="L568" class="LineNr">568 </span><span class="traceContains">+run: effective address is 0x2000 (after adding disp8)</span>
-<span id="L569" class="LineNr">569 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L570" class="LineNr">570 </span>
-<span id="L571" class="LineNr">571 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L572" class="LineNr">572 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
-<span id="L573" class="LineNr">573 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L574" class="LineNr">574 </span>  <span class="Normal">default</span>:
-<span id="L575" class="LineNr">575 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L576" class="LineNr">576 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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="L577" class="LineNr">577 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L578" class="LineNr">578 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
-<span id="L579" class="LineNr">579 </span>  <span class="Delimiter">}</span>
-<span id="L580" class="LineNr">580 </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="L581" class="LineNr">581 </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#L322'>next</a><span class="Delimiter">());</span>
-<span id="L582" class="LineNr">582 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L583" class="LineNr">583 </span>  <span class="Delimiter">}</span>
-<span id="L584" class="LineNr">584 </span>  <span class="Identifier">break</span><span class="Delimiter">;</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 0x1ffe (EAX)</span>
+<span id="L504" class="LineNr">504 </span><span class="traceContains">+run: effective address is 0x2000 (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 = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L512" class="LineNr">512 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L354'>next</a><span class="Delimiter">());</span>
+<span id="L518" class="LineNr">518 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; 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 0x2001 (EAX)</span>
+<span id="L533" class="LineNr">533 </span><span class="traceContains">+run: effective address is 0x2000 (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 0x1ffe (EAX)</span>
+<span id="L549" class="LineNr">549 </span><span class="traceContains">+run: effective address is 0x2000 (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 = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L557" class="LineNr">557 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L563" class="LineNr">563 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; 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 0x2001 (EAX)</span>
+<span id="L578" class="LineNr">578 </span><span class="traceContains">+run: effective address is 0x2000 (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">//:: lea</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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 add_r32_to_mem_at_r32_plus_negative_disp8)</span>
-<span id="L587" class="LineNr">587 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L588" class="LineNr">588 </span><span class="Special">% Reg[EAX].i = 0x2001;  // dest</span>
-<span id="L589" class="LineNr">589 </span>== <span class="Constant">0x1</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="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="L592" class="LineNr">592 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L593" class="LineNr">593 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L594" class="LineNr">594 </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="L595" class="LineNr">595 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L596" class="LineNr">596 </span><span class="traceContains">+run: effective address is initially 0x2001 (EAX)</span>
-<span id="L597" class="LineNr">597 </span><span class="traceContains">+run: effective address is 0x2000 (after adding disp8)</span>
-<span id="L598" class="LineNr">598 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L599" class="LineNr">599 </span>
-<span id="L600" class="LineNr">600 </span><span class="Comment">//:</span>
-<span id="L601" class="LineNr">601 </span>
-<span id="L602" class="LineNr">602 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
-<span id="L603" class="LineNr">603 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L604" class="LineNr">604 </span><span class="Special">% Reg[EAX].i = 0x1ffe;  // dest</span>
-<span id="L605" class="LineNr">605 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</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>  <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="L608" class="LineNr">608 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L609" class="LineNr">609 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L610" class="LineNr">610 </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="L611" class="LineNr">611 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L612" class="LineNr">612 </span><span class="traceContains">+run: effective address is initially 0x1ffe (EAX)</span>
-<span id="L613" class="LineNr">613 </span><span class="traceContains">+run: effective address is 0x2000 (after adding disp32)</span>
-<span id="L614" class="LineNr">614 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L615" class="LineNr">615 </span>
-<span id="L616" class="LineNr">616 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L617" class="LineNr">617 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
-<span id="L618" class="LineNr">618 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L619" class="LineNr">619 </span>  <span class="Normal">default</span>:
-<span id="L620" class="LineNr">620 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L621" class="LineNr">621 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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="L622" class="LineNr">622 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L623" class="LineNr">623 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
-<span id="L624" class="LineNr">624 </span>  <span class="Delimiter">}</span>
-<span id="L625" class="LineNr">625 </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="L626" class="LineNr">626 </span>    addr += <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L627" class="LineNr">627 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L628" class="LineNr">628 </span>  <span class="Delimiter">}</span>
-<span id="L629" class="LineNr">629 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L630" class="LineNr">630 </span>
-<span id="L631" class="LineNr">631 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
-<span id="L632" class="LineNr">632 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L633" class="LineNr">633 </span><span class="Special">% Reg[EAX].i = 0x2001;  // dest</span>
-<span id="L634" class="LineNr">634 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L635" class="LineNr">635 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L636" class="LineNr">636 </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="L637" class="LineNr">637 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L638" class="LineNr">638 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
-<span id="L639" class="LineNr">639 </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="L640" class="LineNr">640 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L641" class="LineNr">641 </span><span class="traceContains">+run: effective address is initially 0x2001 (EAX)</span>
-<span id="L642" class="LineNr">642 </span><span class="traceContains">+run: effective address is 0x2000 (after adding disp32)</span>
-<span id="L643" class="LineNr">643 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L644" class="LineNr">644 </span>
-<span id="L645" class="LineNr">645 </span><span class="SalientComment">//:: lea</span>
-<span id="L646" class="LineNr">646 </span>
-<span id="L647" class="LineNr">647 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L648" class="LineNr">648 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;load effective address of memory in rm32 into r32&quot;</span><span class="Delimiter">);</span>
-<span id="L649" class="LineNr">649 </span>
-<span id="L650" class="LineNr">650 </span><span class="Delimiter">:(scenario lea)</span>
-<span id="L651" class="LineNr">651 </span><span class="Special">% Reg[EAX].u = 0x2000;</span>
-<span id="L652" class="LineNr">652 </span>== <span class="Constant">0x1</span>
-<span id="L653" class="LineNr">653 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L654" class="LineNr">654 </span>  8d  <span class="Constant">18</span>
-<span id="L655" class="LineNr">655 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
-<span id="L656" class="LineNr">656 </span><span class="traceContains">+run: lea into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L657" class="LineNr">657 </span><span class="traceContains">+run: effective address is 0x2000 (EAX)</span>
-<span id="L658" class="LineNr">658 </span>
-<span id="L659" class="LineNr">659 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L660" class="LineNr">660 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// lea m32 to r32</span>
-<span id="L661" class="LineNr">661 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L662" class="LineNr">662 </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="L663" class="LineNr">663 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lea into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L664" class="LineNr">664 </span>  Reg[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="L665" class="LineNr">665 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L666" class="LineNr">666 </span><span class="Delimiter">}</span>
+<span id="L586" class="LineNr">586 </span><span class="Delimiter">:(scenario lea)</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: lea 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 0x2000 (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">// lea 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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;lea into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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>  Reg[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>
 </pre>
 </body>
 </html>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index 83ac6f4f..fd6045d2 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -64,8 +64,8 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: instructions that (immediately) contain an argument to act with</span>
 <span id="L2" class="LineNr">  2 </span>
-<span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with imm32 based on subop&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with imm32 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>
@@ -81,20 +81,20 @@ if ('onhashchange' in window) {
 <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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 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#L354'>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">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </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="L23" class="LineNr"> 23 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop 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 sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>
@@ -118,8 +118,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 from R0 (EAX)&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 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>
@@ -131,9 +131,9 @@ if ('onhashchange' in window) {
 <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">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>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#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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> Reg[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>
@@ -155,8 +155,8 @@ if ('onhashchange' in window) {
 <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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop 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>
@@ -176,8 +176,8 @@ if ('onhashchange' in window) {
 <span id="L112" class="LineNr">112 </span>
 <span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: and</span>
 <span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of imm32 with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
 <span id="L117" class="LineNr">117 </span>
 <span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
 <span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
@@ -189,9 +189,9 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span>
 <span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L127" class="LineNr">127 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L130" class="LineNr">130 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L129" class="LineNr">129 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
 <span id="L133" class="LineNr">133 </span>
@@ -213,8 +213,8 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr">149 </span>
 <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L151" class="LineNr">151 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L153" class="LineNr">153 </span>  <a href='010---vm.cc.html#L81'>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="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop and&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L154" class="LineNr">154 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
 <span id="L156" class="LineNr">156 </span>
@@ -234,8 +234,8 @@ if ('onhashchange' in window) {
 <span id="L170" class="LineNr">170 </span>
 <span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: or</span>
 <span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L174" class="LineNr">174 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of imm32 with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L174" class="LineNr">174 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
 <span id="L175" class="LineNr">175 </span>
 <span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
 <span id="L177" class="LineNr">177 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
@@ -247,9 +247,9 @@ if ('onhashchange' in window) {
 <span id="L183" class="LineNr">183 </span>
 <span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L185" class="LineNr">185 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L188" class="LineNr">188 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L188" class="LineNr">188 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L189" class="LineNr">189 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
 <span id="L191" class="LineNr">191 </span>
@@ -271,8 +271,8 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span>
 <span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L211" class="LineNr">211 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop or&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L212" class="LineNr">212 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span>
 <span id="L214" class="LineNr">214 </span>
@@ -290,8 +290,8 @@ if ('onhashchange' in window) {
 <span id="L226" class="LineNr">226 </span>
 <span id="L227" class="LineNr">227 </span><span class="SalientComment">//:: xor</span>
 <span id="L228" class="LineNr">228 </span>
-<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L230" class="LineNr">230 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of imm32 with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L230" class="LineNr">230 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L231" class="LineNr">231 </span>
 <span id="L232" class="LineNr">232 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
 <span id="L233" class="LineNr">233 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
@@ -303,9 +303,9 @@ if ('onhashchange' in window) {
 <span id="L239" class="LineNr">239 </span>
 <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L241" class="LineNr">241 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L244" class="LineNr">244 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L242" class="LineNr">242 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L245" class="LineNr">245 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
 <span id="L247" class="LineNr">247 </span>
@@ -327,8 +327,8 @@ if ('onhashchange' in window) {
 <span id="L263" class="LineNr">263 </span>
 <span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L265" class="LineNr">265 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L267" class="LineNr">267 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop xor&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L268" class="LineNr">268 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span>
 <span id="L270" class="LineNr">270 </span>
@@ -346,8 +346,8 @@ if ('onhashchange' in window) {
 <span id="L282" class="LineNr">282 </span>
 <span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if R0 &lt; imm32&quot;</span><span class="Delimiter">);</span>
+<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; imm32 (cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L287" class="LineNr">287 </span>
 <span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
 <span id="L289" class="LineNr">289 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
@@ -359,15 +359,15 @@ if ('onhashchange' in window) {
 <span id="L295" class="LineNr">295 </span>
 <span id="L296" class="LineNr">296 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L297" class="LineNr">297 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L300" class="LineNr">300 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L301" class="LineNr">301 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L302" class="LineNr">302 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L303" class="LineNr">303 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L307" class="LineNr">307 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span>
 <span id="L309" class="LineNr">309 </span>
@@ -402,13 +402,13 @@ if ('onhashchange' in window) {
 <span id="L338" class="LineNr">338 </span>
 <span id="L339" class="LineNr">339 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
 <span id="L340" class="LineNr">340 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop compare&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
 <span id="L343" class="LineNr">343 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L344" class="LineNr">344 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L345" class="LineNr">345 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L346" class="LineNr">346 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L346" class="LineNr">346 </span>  <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L81'>OF</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L348" class="LineNr">348 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
 <span id="L350" class="LineNr">350 </span>
@@ -476,15 +476,15 @@ if ('onhashchange' in window) {
 <span id="L412" class="LineNr">412 </span>
 <span id="L413" class="LineNr">413 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L414" class="LineNr">414 </span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L418" class="LineNr">418 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L420" class="LineNr">420 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L421" class="LineNr">421 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L423" class="LineNr">423 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L418" class="LineNr">418 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L420" class="LineNr">420 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L421" class="LineNr">421 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L423" class="LineNr">423 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L424" class="LineNr">424 </span>
 <span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
 <span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>
@@ -501,17 +501,17 @@ if ('onhashchange' in window) {
 <span id="L437" class="LineNr">437 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
 <span id="L438" class="LineNr">438 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
 <span id="L439" class="LineNr">439 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L440" class="LineNr">440 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L443" class="LineNr">443 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>  Reg[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
 <span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
 <span id="L446" class="LineNr">446 </span>
 <span id="L447" class="LineNr">447 </span><span class="Comment">//:</span>
 <span id="L448" class="LineNr">448 </span>
-<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L451" class="LineNr">451 </span>
 <span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
 <span id="L453" class="LineNr">453 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
@@ -525,19 +525,19 @@ if ('onhashchange' in window) {
 <span id="L461" class="LineNr">461 </span>
 <span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L463" class="LineNr">463 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
-<span id="L464" class="LineNr">464 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L466" class="LineNr">466 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L469" class="LineNr">469 </span>  *arg1 = arg2<span class="Delimiter">;</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L466" class="LineNr">466 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L469" class="LineNr">469 </span>  *dest = src<span class="Delimiter">;</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span>
 <span id="L472" class="LineNr">472 </span>
 <span id="L473" class="LineNr">473 </span><span class="SalientComment">//:: push</span>
 <span id="L474" class="LineNr">474 </span>
-<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack (push)&quot;</span><span class="Delimiter">);</span>
 <span id="L477" class="LineNr">477 </span>
 <span id="L478" class="LineNr">478 </span><span class="Delimiter">:(scenario push_imm32)</span>
 <span id="L479" class="LineNr">479 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
@@ -550,12 +550,12 @@ if ('onhashchange' in window) {
 <span id="L486" class="LineNr">486 </span>
 <span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L488" class="LineNr">488 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L489" class="LineNr">489 </span>  <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
-<span id="L490" class="LineNr">490 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L489" class="LineNr">489 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
+<span id="L490" class="LineNr">490 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L491" class="LineNr">491 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L492" class="LineNr">492 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L493" class="LineNr">493 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L178'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L493" class="LineNr">493 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L495" class="LineNr">495 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L496" class="LineNr">496 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index f5801589..14729e00 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -83,27 +83,27 @@ if ('onhashchange' in window) {
 <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">uint8_t</span> sib = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">uint8_t</span> base = sib&amp;<span class="Constant">0x7</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#L354'>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 = Reg[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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="L29" class="LineNr"> 29 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L343'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; 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">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="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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L39" class="LineNr"> 39 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &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">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="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 += Reg[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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L370'>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="L44" class="LineNr"> 44 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L405'>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>
diff --git a/html/subx/017jump_disp8.cc.html b/html/subx/017jump_disp8.cc.html
index a29779b1..79d4dfa8 100644
--- a/html/subx/017jump_disp8.cc.html
+++ b/html/subx/017jump_disp8.cc.html
@@ -65,8 +65,8 @@ if ('onhashchange' in window) {
 <span id="L2" class="LineNr">  2 </span>
 <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(name)&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -81,16 +81,16 @@ if ('onhashchange' in window) {
 <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#L322'>next</a><span class="Delimiter">());</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>next</a><span class="Delimiter">());</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>  <a href='010---vm.cc.html#L29'>EIP</a> += 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(name)&quot;)</span>
-<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if ZF is set&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -106,9 +106,9 @@ if ('onhashchange' in window) {
 <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">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#L322'>next</a><span class="Delimiter">());</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#L354'>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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>    <a href='010---vm.cc.html#L29'>EIP</a> += 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>
@@ -128,8 +128,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp8 bytes away if ZF is not set&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -145,9 +145,9 @@ if ('onhashchange' in window) {
 <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">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#L322'>next</a><span class="Delimiter">());</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#L354'>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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>    <a href='010---vm.cc.html#L29'>EIP</a> += 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>
@@ -167,13 +167,13 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span>
 <span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span>
 <span id="L106" class="LineNr">106 </span>
-<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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 (ZF is unset, SF == OF)&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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#L59'>OF</a> = 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>
@@ -186,9 +186,9 @@ if ('onhashchange' in window) {
 <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">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#L322'>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#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>    <a href='010---vm.cc.html#L29'>EIP</a> += 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>
@@ -197,7 +197,7 @@ if ('onhashchange' in window) {
 <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#L59'>OF</a> = false;</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>
@@ -210,12 +210,12 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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 (SF == OF)&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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#L59'>OF</a> = 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>
@@ -228,9 +228,9 @@ if ('onhashchange' in window) {
 <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">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#L322'>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#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L170" class="LineNr">170 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>    <a href='010---vm.cc.html#L29'>EIP</a> += 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>
@@ -238,7 +238,7 @@ if ('onhashchange' in window) {
 <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#L59'>OF</a> = false;</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>
@@ -251,13 +251,13 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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 (SF != OF)&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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#L59'>OF</a> = false;</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>
@@ -270,9 +270,9 @@ if ('onhashchange' in window) {
 <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">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#L322'>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#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L212" class="LineNr">212 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>    <a href='010---vm.cc.html#L29'>EIP</a> += 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>
@@ -281,7 +281,7 @@ if ('onhashchange' in window) {
 <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#L59'>OF</a> = 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>
@@ -294,13 +294,13 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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 (ZF is set or SF != OF)&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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#L59'>OF</a> = 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>
@@ -314,7 +314,7 @@ if ('onhashchange' in window) {
 <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#L59'>OF</a> = false;</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>
@@ -327,9 +327,9 @@ if ('onhashchange' in window) {
 <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">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#L322'>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#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L269" class="LineNr">269 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>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>    <a href='010---vm.cc.html#L29'>EIP</a> += 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>
@@ -338,7 +338,7 @@ if ('onhashchange' in window) {
 <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#L59'>OF</a> = 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>
diff --git a/html/subx/018jump_disp16.cc.html b/html/subx/018jump_disp16.cc.html
index 050d71eb..b1423d0e 100644
--- a/html/subx/018jump_disp16.cc.html
+++ b/html/subx/018jump_disp16.cc.html
@@ -65,8 +65,8 @@ if ('onhashchange' in window) {
 <span id="L2" class="LineNr">  2 </span>
 <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(name)&quot;)</span>
-<span id="L6" class="LineNr">  6 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 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_rel16)</span>
 <span id="L9" class="LineNr">  9 </span>== <span class="Constant">0x1</span>
@@ -81,22 +81,22 @@ if ('onhashchange' in window) {
 <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 rel8</span>
-<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">int16_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> <span class="Normal">int16_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L22" class="LineNr"> 22 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L23" class="LineNr"> 23 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L24" class="LineNr"> 24 </span>  <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 class="Delimiter">:(code)</span>
 <span id="L27" class="LineNr"> 27 </span><span class="Normal">int16_t</span> <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">int16_t</span> result = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L29" class="LineNr"> 29 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">int16_t</span> result = <a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L354'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Identifier">return</span> result<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(name)&quot;)</span>
-<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if ZF is set&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if equal, if ZF 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">:(scenario je_rel16_success)</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Special">% ZF = true;</span>
@@ -112,9 +112,9 @@ if ('onhashchange' in window) {
 <span id="L49" class="LineNr"> 49 </span>
 <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L51" class="LineNr"> 51 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if ZF</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L55" class="LineNr"> 55 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L56" class="LineNr"> 56 </span>  <span class="Delimiter">}</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -134,8 +134,8 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span>
 <span id="L72" class="LineNr"> 72 </span><span class="SalientComment">//:: jump if not equal/not zero</span>
 <span id="L73" class="LineNr"> 73 </span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L75" class="LineNr"> 75 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if ZF is not set&quot;</span><span class="Delimiter">);</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L75" class="LineNr"> 75 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if not equal, if ZF is not set (jcc/jnz/jne)&quot;</span><span class="Delimiter">);</span>
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(scenario jne_rel16_success)</span>
 <span id="L78" class="LineNr"> 78 </span><span class="Special">% ZF = false;</span>
@@ -151,9 +151,9 @@ if ('onhashchange' in window) {
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 unless ZF</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L93" class="LineNr"> 93 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L94" class="LineNr"> 94 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L95" class="LineNr"> 95 </span>  <span class="Delimiter">}</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -173,13 +173,13 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span>
 <span id="L111" class="LineNr">111 </span><span class="SalientComment">//:: jump if greater</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L114" class="LineNr">114 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if greater (ZF is unset, SF == OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L114" class="LineNr">114 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 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="L115" class="LineNr">115 </span>
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario jg_rel16_success)</span>
 <span id="L117" class="LineNr">117 </span><span class="Special">% ZF = false;</span>
 <span id="L118" class="LineNr">118 </span><span class="Special">% SF = false;</span>
-<span id="L119" class="LineNr">119 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L119" class="LineNr">119 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L120" class="LineNr">120 </span>== <span class="Constant">0x1</span>
 <span id="L121" class="LineNr">121 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L122" class="LineNr">122 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -192,9 +192,9 @@ if ('onhashchange' in window) {
 <span id="L129" class="LineNr">129 </span>
 <span id="L130" class="LineNr">130 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L131" class="LineNr">131 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if !SF and !ZF</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF &amp;&amp; SF == <a href='010---vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L134" class="LineNr">134 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L133" class="LineNr">133 </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="L134" class="LineNr">134 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L135" class="LineNr">135 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Delimiter">}</span>
 <span id="L137" class="LineNr">137 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -203,7 +203,7 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span><span class="Delimiter">:(scenario jg_rel16_fail)</span>
 <span id="L141" class="LineNr">141 </span><span class="Special">% ZF = false;</span>
 <span id="L142" class="LineNr">142 </span><span class="Special">% SF = true;</span>
-<span id="L143" class="LineNr">143 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L143" class="LineNr">143 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L144" class="LineNr">144 </span>== <span class="Constant">0x1</span>
 <span id="L145" class="LineNr">145 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L146" class="LineNr">146 </span>  <span class="Constant">0f</span> <span class="Constant">8f</span>                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -216,12 +216,12 @@ if ('onhashchange' in window) {
 <span id="L153" class="LineNr">153 </span>
 <span id="L154" class="LineNr">154 </span><span class="SalientComment">//:: jump if greater or equal</span>
 <span id="L155" class="LineNr">155 </span>
-<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L157" class="LineNr">157 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if greater or equal (SF == OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L157" class="LineNr">157 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 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="L158" class="LineNr">158 </span>
 <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario jge_rel16_success)</span>
 <span id="L160" class="LineNr">160 </span><span class="Special">% SF = false;</span>
-<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L162" class="LineNr">162 </span>== <span class="Constant">0x1</span>
 <span id="L163" class="LineNr">163 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L164" class="LineNr">164 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -234,9 +234,9 @@ if ('onhashchange' in window) {
 <span id="L171" class="LineNr">171 </span>
 <span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L173" class="LineNr">173 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if !SF</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L175" class="LineNr">175 </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="L176" class="LineNr">176 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L177" class="LineNr">177 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
 <span id="L178" class="LineNr">178 </span>  <span class="Delimiter">}</span>
 <span id="L179" class="LineNr">179 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -244,7 +244,7 @@ if ('onhashchange' in window) {
 <span id="L181" class="LineNr">181 </span>
 <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(scenario jge_rel16_fail)</span>
 <span id="L183" class="LineNr">183 </span><span class="Special">% SF = true;</span>
-<span id="L184" class="LineNr">184 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L184" class="LineNr">184 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L185" class="LineNr">185 </span>== <span class="Constant">0x1</span>
 <span id="L186" class="LineNr">186 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L187" class="LineNr">187 </span>  <span class="Constant">0f</span> 8d                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -257,13 +257,13 @@ if ('onhashchange' in window) {
 <span id="L194" class="LineNr">194 </span>
 <span id="L195" class="LineNr">195 </span><span class="SalientComment">//:: jump if lesser</span>
 <span id="L196" class="LineNr">196 </span>
-<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if lesser (SF != OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 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="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario jl_rel16_success)</span>
 <span id="L201" class="LineNr">201 </span><span class="Special">% ZF = false;</span>
 <span id="L202" class="LineNr">202 </span><span class="Special">% SF = true;</span>
-<span id="L203" class="LineNr">203 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L203" class="LineNr">203 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</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>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -276,9 +276,9 @@ if ('onhashchange' in window) {
 <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">0x8c</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if SF and !ZF</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</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#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L218" class="LineNr">218 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L216" class="LineNr">216 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L219" class="LineNr">219 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<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>
@@ -287,7 +287,7 @@ if ('onhashchange' in window) {
 <span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario jl_rel16_fail)</span>
 <span id="L225" class="LineNr">225 </span><span class="Special">% ZF = false;</span>
 <span id="L226" class="LineNr">226 </span><span class="Special">% SF = false;</span>
-<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L228" class="LineNr">228 </span>== <span class="Constant">0x1</span>
 <span id="L229" class="LineNr">229 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L230" class="LineNr">230 </span>  <span class="Constant">0f</span> 8c                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -300,13 +300,13 @@ if ('onhashchange' in window) {
 <span id="L237" class="LineNr">237 </span>
 <span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: jump if lesser or equal</span>
 <span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 bytes away if lesser or equal (ZF is set or SF != OF)&quot;</span><span class="Delimiter">);</span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump disp16 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="L242" class="LineNr">242 </span>
 <span id="L243" class="LineNr">243 </span><span class="Delimiter">:(scenario jle_rel16_equal)</span>
 <span id="L244" class="LineNr">244 </span><span class="Special">% ZF = true;</span>
 <span id="L245" class="LineNr">245 </span><span class="Special">% SF = false;</span>
-<span id="L246" class="LineNr">246 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L246" class="LineNr">246 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L247" class="LineNr">247 </span>== <span class="Constant">0x1</span>
 <span id="L248" class="LineNr">248 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L249" class="LineNr">249 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -320,7 +320,7 @@ if ('onhashchange' in window) {
 <span id="L257" class="LineNr">257 </span><span class="Delimiter">:(scenario jle_rel16_lesser)</span>
 <span id="L258" class="LineNr">258 </span><span class="Special">% ZF = false;</span>
 <span id="L259" class="LineNr">259 </span><span class="Special">% SF = true;</span>
-<span id="L260" class="LineNr">260 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L260" class="LineNr">260 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L261" class="LineNr">261 </span>== <span class="Constant">0x1</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">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
@@ -333,9 +333,9 @@ if ('onhashchange' in window) {
 <span id="L270" class="LineNr">270 </span>
 <span id="L271" class="LineNr">271 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
 <span id="L272" class="LineNr">272 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump rel16 if SF or ZF</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L59'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>  <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span>
+<span id="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jump &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L405'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L276" class="LineNr">276 </span>    <a href='010---vm.cc.html#L29'>EIP</a> += offset<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">break</span><span class="Delimiter">;</span>
@@ -344,7 +344,7 @@ if ('onhashchange' in window) {
 <span id="L281" class="LineNr">281 </span><span class="Delimiter">:(scenario jle_rel16_greater)</span>
 <span id="L282" class="LineNr">282 </span><span class="Special">% ZF = false;</span>
 <span id="L283" class="LineNr">283 </span><span class="Special">% SF = false;</span>
-<span id="L284" class="LineNr">284 </span><span class="Special">% <a href='010---vm.cc.html#L59'>OF</a> = false;</span>
+<span id="L284" class="LineNr">284 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span>
 <span id="L285" class="LineNr">285 </span>== <span class="Constant">0x1</span>
 <span id="L286" class="LineNr">286 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
 <span id="L287" class="LineNr">287 </span>  <span class="Constant">0f</span> 8e                 <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span>                     <span class="Comment"># skip 1 instruction</span>
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index 5af61806..c31f99e8 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -63,8 +63,8 @@ if ('onhashchange' in window) {
 <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(name)&quot;)</span>
-<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;call disp32&quot;</span><span class="Delimiter">);</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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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>
@@ -79,12 +79,12 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr">16 </span>
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call disp32 relative to next EIP</span>
-<span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</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#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L21" class="LineNr">21 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: EIP: &quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L22" class="LineNr">22 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L23" class="LineNr">23 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
-<span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L26" class="LineNr">26 </span><span class="Delimiter">}</span>
 <span id="L27" class="LineNr">27 </span>
@@ -105,11 +105,11 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr">42 </span>
 <span id="L43" class="LineNr">43 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
 <span id="L44" class="LineNr">44 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// call function pointer at r/m32</span>
-<span id="L45" class="LineNr">45 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L46" class="LineNr">46 </span>  <span class="Normal">int32_t</span>* offset = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L45" class="LineNr">45 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L46" class="LineNr">46 </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="L47" class="LineNr">47 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L48" class="LineNr">48 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += *offset<span class="Delimiter">;</span>
-<span id="L49" class="LineNr">49 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L49" class="LineNr">49 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L50" class="LineNr">50 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span>
 <span id="L52" class="LineNr">52 </span>
@@ -130,8 +130,8 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr">67 </span>
 <span id="L68" class="LineNr">68 </span><span class="SalientComment">//:: ret</span>
 <span id="L69" class="LineNr">69 </span>
-<span id="L70" class="LineNr">70 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L71" class="LineNr">71 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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&quot;</span><span class="Delimiter">);</span>
+<span id="L70" class="LineNr">70 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L71" class="LineNr">71 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L72" class="LineNr">72 </span>
 <span id="L73" class="LineNr">73 </span><span class="Delimiter">:(scenario ret)</span>
 <span id="L74" class="LineNr">74 </span><span class="Special">% Reg[ESP].u = 0x2000;</span>
@@ -146,9 +146,9 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr">83 </span>
 <span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
-<span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L586'>pop</a><span class="Delimiter">();</span>
-<span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;return&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L583'>pop</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L89" class="LineNr">89 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr">90 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/subx/020syscalls.cc.html b/html/subx/020syscalls.cc.html
index 33249163..b62a6dda 100644
--- a/html/subx/020syscalls.cc.html
+++ b/html/subx/020syscalls.cc.html
@@ -58,16 +58,16 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L2" class="LineNr">  2 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;software interrupt&quot;</span><span class="Delimiter">);</span>
+<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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;syscall&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L7" class="LineNr">  7 </span>  <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L14'>code</a> = <a href='010---vm.cc.html#L322'>next</a><span class="Delimiter">();</span>
-<span id="L8" class="LineNr">  8 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a> != <span class="Constant">0x80</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L9" class="LineNr">  9 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;Unimplemented interrupt <a href='031check_operands.cc.html#L14'>code</a> &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='031check_operands.cc.html#L14'>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#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L6" class="LineNr">  6 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L354'>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#L210'>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#L402'>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#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;  Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; 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,74 +78,74 @@ if ('onhashchange' in window) {
 <span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Normal">case</span> <span class="Constant">1</span>:
-<span id="L21" class="LineNr"> 21 </span>    exit<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">exit <a href='031check_operands.cc.html#L14'>code</a></span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="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>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L22" class="LineNr"> 22 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
-<span id="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;read: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L25" class="LineNr"> 25 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L26" class="LineNr"> 26 </span>    Reg[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>Reg[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#L186'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L28" class="LineNr"> 28 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L24" class="LineNr"> 24 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;read: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L25" class="LineNr"> 25 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L246'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>    Reg[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>Reg[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#L208'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L27" class="LineNr"> 27 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L28" class="LineNr"> 28 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L29" class="LineNr"> 29 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Normal">case</span> <span class="Constant">4</span>:
-<span id="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;write: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L33" class="LineNr"> 33 </span>    Reg[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>Reg[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#L186'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L31" class="LineNr"> 31 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;write: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[EDX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L246'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L33" class="LineNr"> 33 </span>    Reg[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>Reg[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#L208'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L35" class="LineNr"> 35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L36" class="LineNr"> 36 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
 <span id="L38" class="LineNr"> 38 </span>    <a href='020syscalls.cc.html#L94'>check_flags</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>    <a href='020syscalls.cc.html#L106'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L15'>EDX</a><span class="Delimiter">);</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;open: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L42" class="LineNr"> 42 </span>    Reg[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#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">flags</span><span class="Comment">*/</span>Reg[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="L43" class="LineNr"> 43 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L44" class="LineNr"> 44 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;open: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">' '</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    Reg[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#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">flags</span><span class="Comment">*/</span>Reg[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="L43" class="LineNr"> 43 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L45" class="LineNr"> 45 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L46" class="LineNr"> 46 </span>  <span class="Delimiter">}</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Normal">case</span> <span class="Constant">6</span>:
-<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;close: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;close: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L49" class="LineNr"> 49 </span>    Reg[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>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L51" class="LineNr"> 51 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L50" class="LineNr"> 50 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L52" class="LineNr"> 52 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">case</span> <span class="Constant">8</span>:
 <span id="L54" class="LineNr"> 54 </span>    <a href='020syscalls.cc.html#L106'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creat: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L56" class="LineNr"> 56 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L57" class="LineNr"> 57 </span>    Reg[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#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[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="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L59" class="LineNr"> 59 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L55" class="LineNr"> 55 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;creat: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L56" class="LineNr"> 56 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>    Reg[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#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[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="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L60" class="LineNr"> 60 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">case</span> <span class="Constant">10</span>:
-<span id="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unlink: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L63" class="LineNr"> 63 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L64" class="LineNr"> 64 </span>    Reg[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#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L62" class="LineNr"> 62 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;unlink: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L63" class="LineNr"> 63 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>    Reg[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#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
+<span id="L65" class="LineNr"> 65 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L67" class="LineNr"> 67 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Normal">case</span> <span class="Constant">38</span>:
-<span id="L69" class="LineNr"> 69 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;rename: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L72" class="LineNr"> 72 </span>    Reg[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#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[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#L221'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
-<span id="L73" class="LineNr"> 73 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L211'>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="L69" class="LineNr"> 69 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;rename: &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; Reg[ECX]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>    Reg[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#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[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#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>
+<span id="L73" class="LineNr"> 73 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>i &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>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="L75" class="LineNr"> 75 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L76" class="LineNr"> 76 </span>  <span class="Normal">case</span> <span class="Constant">45</span>:  <span class="Comment">// brk: modify size of data segment</span>
-<span id="L77" class="LineNr"> 77 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow data segment to &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L78" class="LineNr"> 78 </span>    <a href='010---vm.cc.html#L158'>grow_data_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new end address</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L77" class="LineNr"> 77 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;grow data segment to &quot;</span> &lt;&lt; Reg[EBX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span>    <a href='010---vm.cc.html#L180'>grow_data_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new end address</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
 <span id="L79" class="LineNr"> 79 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">case</span> <span class="Constant">90</span>:  <span class="Comment">// mmap: allocate memory outside existing segment allocations</span>
-<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mmap: allocate new segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;mmap: allocate new segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="Comment">// Ignore most arguments for now: address hint, protection flags, sharing flags, fd, offset.</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Comment">// We only support anonymous maps.</span>
-<span id="L84" class="LineNr"> 84 </span>    Reg[EAX]<span class="Delimiter">.</span>u = <a href='020syscalls.cc.html#L117'>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#L178'>read_mem_u32</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u+<span class="Constant">0x4</span><span class="Delimiter">));</span>
-<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L84" class="LineNr"> 84 </span>    Reg[EAX]<span class="Delimiter">.</span>u = <a href='020syscalls.cc.html#L117'>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#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u+<span class="Constant">0x4</span><span class="Delimiter">));</span>
+<span id="L85" class="LineNr"> 85 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;result: &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L87" class="LineNr"> 87 </span>  <span class="Normal">default</span>:
-<span id="L88" class="LineNr"> 88 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; Reg[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>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: unimplemented syscall &quot;</span> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L89" class="LineNr"> 89 </span>  <span class="Delimiter">}</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>
@@ -154,18 +154,18 @@ if ('onhashchange' in window) {
 <span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L94'>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="L95" class="LineNr"> 95 </span>  <span class="Normal">uint32_t</span> flags = Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
 <span id="L96" class="LineNr"> 96 </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="L97" class="LineNr"> 97 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: most POSIX flags to the open() syscall are not supported. Just O_RDONLY and O_WRONLY for now. Zero concurrent access support.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: most POSIX flags to the open() syscall are not supported. Just O_RDONLY and O_WRONLY for now. Zero concurrent access support.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L98" class="LineNr"> 98 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L99" class="LineNr"> 99 </span>  <span class="Delimiter">}</span>
 <span id="L100" class="LineNr">100 </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="L101" class="LineNr">101 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: can't open a file for both reading and writing at once. See <a href="http://man7.org/linux/man-pages/man2/open.2.html">http://man7.org/linux/man-pages/man2/open.2.html</a>.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L101" class="LineNr">101 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: can't open a file for both reading and writing at once. See <a href="http://man7.org/linux/man-pages/man2/open.2.html">http://man7.org/linux/man-pages/man2/open.2.html</a>.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L102" class="LineNr">102 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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="Delimiter">}</span>
 <span id="L105" class="LineNr">105 </span>
 <span id="L106" class="LineNr">106 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L106'>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="L107" class="LineNr">107 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u != <span class="PreProc">0</span><span class="Constant">600</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L108" class="LineNr">108 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: SubX is oblivious to file permissions; register &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L23'>reg</a> &lt;&lt; <span class="Constant">&quot; must be 0.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L108" class="LineNr">108 </span>    cerr &lt;&lt; <a href='010---vm.cc.html#L403'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <span class="Constant">&quot;: SubX is oblivious to file permissions; register &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L23'>reg</a> &lt;&lt; <span class="Constant">&quot; must be 0.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L109" class="LineNr">109 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Delimiter">}</span>
 <span id="L111" class="LineNr">111 </span><span class="Delimiter">}</span>
@@ -176,7 +176,7 @@ if ('onhashchange' in window) {
 <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(code)</span>
 <span id="L117" class="LineNr">117 </span><span class="Normal">uint32_t</span> <a href='020syscalls.cc.html#L117'>new_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> length<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L118" class="LineNr">118 </span>  <span class="Normal">uint32_t</span> result = <a href='020syscalls.cc.html#L114'>Next_segment</a><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span>  <a href='010---vm.cc.html#L149'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='020syscalls.cc.html#L114'>Next_segment</a><span class="Delimiter">,</span> Next_segment+length<span class="Delimiter">));</span>
+<span id="L119" class="LineNr">119 </span>  <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='020syscalls.cc.html#L114'>Next_segment</a><span class="Delimiter">,</span> Next_segment+length<span class="Delimiter">));</span>
 <span id="L120" class="LineNr">120 </span>  <a href='020syscalls.cc.html#L114'>Next_segment</a> -= <a href='020syscalls.cc.html#L115'>SPACE_FOR_SEGMENT</a><span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L122" class="LineNr">122 </span><span class="Delimiter">}</span>
diff --git a/html/subx/021byte_addressing.cc.html b/html/subx/021byte_addressing.cc.html
new file mode 100644
index 00000000..8c0e583a
--- /dev/null
+++ b/html/subx/021byte_addressing.cc.html
@@ -0,0 +1,181 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/021byte_addressing.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.cSpecial { color: #008000; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment">//: SubX mostly deals with instructions operating on 32-bit operands, but we</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: still need to deal with raw bytes for strings and so on.</span>
+<span id="L3" class="LineNr">  3 </span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//: Unfortunately the register encodings when dealing with bytes are a mess.</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: We need a special case for them.</span>
+<span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(code)</span>
+<span id="L7" class="LineNr">  7 </span>string <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L8" class="LineNr">  8 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">&quot;AL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// lowest byte of EAX</span>
+<span id="L10" class="LineNr"> 10 </span>  <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">&quot;CL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// lowest byte of ECX</span>
+<span id="L11" class="LineNr"> 11 </span>  <span class="Normal">case</span> <span class="Constant">2</span>: <span class="Identifier">return</span> <span class="Constant">&quot;DL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// lowest byte of EDX</span>
+<span id="L12" class="LineNr"> 12 </span>  <span class="Normal">case</span> <span class="Constant">3</span>: <span class="Identifier">return</span> <span class="Constant">&quot;BL&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// lowest byte of EBX</span>
+<span id="L13" class="LineNr"> 13 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Identifier">return</span> <span class="Constant">&quot;AH&quot;</span><span class="Delimiter">;</span>  <span class="Comment">// second lowest byte of EAX</span>
+<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#L210'>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>
+<span id="L21" class="LineNr"> 21 </span><span class="Normal">uint8_t</span>* <a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L22" class="LineNr"> 22 </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="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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L208'>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="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>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Normal">uint8_t</span>* result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span>&amp;Reg[rm &amp; <span class="Constant">0x3</span>]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>  <span class="Comment">// _L register</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>rm &amp; <span class="Constant">0x4</span><span class="Delimiter">)</span>
+<span id="L36" class="LineNr"> 36 </span>    ++result<span class="Delimiter">;</span>  <span class="Comment">// _H register;  assumes host is little-endian</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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 class="Comment"># 0xf0 with more data in following bytes</span>
+<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 0x2000 (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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy &quot;</span> &lt;&lt; <a href='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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>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#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8&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 0x2000 (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#L354'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy 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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>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#L403'>HEXWORD</a> &lt;&lt; Reg[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>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index b83965bf..e6c2e077 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -78,177 +78,179 @@ 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#L89'>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#L253'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L252'>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>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
-<span id="L24" class="LineNr"> 24 </span>  string output_filename<span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>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>
-<span id="L27" class="LineNr"> 27 </span>      ++i<span class="Delimiter">;</span>
-<span id="L28" class="LineNr"> 28 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt;= argc<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>        <a href='028translate.cc.html#L66'>print_translate_usage</a><span class="Delimiter">();</span>
-<span id="L30" class="LineNr"> 30 </span>        cerr &lt;&lt; <span class="Constant">&quot;'-o' must be followed by a filename to write results to</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L32" class="LineNr"> 32 </span>      <span class="Delimiter">}</span>
-<span id="L33" class="LineNr"> 33 </span>      output_filename = argv[i]<span class="Delimiter">;</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="Delimiter">}</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>      ifstream fin<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>
-<span id="L37" class="LineNr"> 37 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L38" class="LineNr"> 38 </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="L39" class="LineNr"> 39 </span>        <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L40" class="LineNr"> 40 </span>      <span class="Delimiter">}</span>
-<span id="L41" class="LineNr"> 41 </span>      parse<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L42" class="LineNr"> 42 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</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="Delimiter">}</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>    <a href='028translate.cc.html#L66'>print_translate_usage</a><span class="Delimiter">();</span>
-<span id="L47" class="LineNr"> 47 </span>    cerr &lt;&lt; <span class="Constant">&quot;nothing to do; must provide at least one file to read</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L48" class="LineNr"> 48 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</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>output_filename<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L51" class="LineNr"> 51 </span>    <a href='028translate.cc.html#L66'>print_translate_usage</a><span class="Delimiter">();</span>
-<span id="L52" class="LineNr"> 52 </span>    cerr &lt;&lt; <span class="Constant">&quot;must provide a filename to write to using '-o'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
-<span id="L53" class="LineNr"> 53 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Delimiter">}</span>
-<span id="L55" class="LineNr"> 55 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L57" class="LineNr"> 57 </span>  <a href='028translate.cc.html#L71'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> output_filename<span class="Delimiter">);</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>    unlink<span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
-<span id="L60" class="LineNr"> 60 </span>    <span class="Identifier">return</span> <span class="Constant">1</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="Identifier">return</span> <span class="Constant">0</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="Delimiter">:(code)</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Normal">void</span> <a href='028translate.cc.html#L66'>print_translate_usage</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L67" class="LineNr"> 67 </span>  cerr &lt;&lt; <span class="Constant">&quot;Usage: subx translate file1 file2 ... -o output</span><span class="cSpecial">\n</span><span class="Constant">&quot;</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">// write out a program to a bare-bones ELF file</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Normal">void</span> <a href='028translate.cc.html#L71'>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="L72" class="LineNr"> 72 </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="L73" class="LineNr"> 73 </span>  <a href='028translate.cc.html#L79'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L74" class="LineNr"> 74 </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#L100'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
-<span id="L75" class="LineNr"> 75 </span>    <a href='028translate.cc.html#L173'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
-<span id="L76" class="LineNr"> 76 </span>  out<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">}</span>
-<span id="L78" class="LineNr"> 78 </span>
-<span id="L79" class="LineNr"> 79 </span><span class="Normal">void</span> <a href='028translate.cc.html#L79'>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="L80" class="LineNr"> 80 </span>  <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Comment">#define O(X)  c = (X); out.write(&amp;c, sizeof(c))</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Comment">// host is required to be little-endian</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Comment">#define emit(X)  out.write(reinterpret_cast&lt;const char*&gt;(&amp;X), sizeof(X))</span>
-<span id="L84" class="LineNr"> 84 </span>  <span class="SalientComment">//// ehdr</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">// e_ident</span>
-<span id="L86" class="LineNr"> 86 </span>  O<span class="Delimiter">(</span><span class="Constant">0x7f</span><span class="Delimiter">);</span> O<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> O<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> O<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>
-<span id="L87" class="LineNr"> 87 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// 32-bit format</span>
-<span id="L88" class="LineNr"> 88 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// little-endian</span>
-<span id="L89" class="LineNr"> 89 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span>
-<span id="L90" class="LineNr"> 90 </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; <span class="Constant">8</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span> <span class="Delimiter">}</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Comment">// e_type</span>
-<span id="L92" class="LineNr"> 92 </span>  O<span class="Delimiter">(</span><span class="Constant">0x02</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Comment">// e_machine</span>
-<span id="L94" class="LineNr"> 94 </span>  O<span class="Delimiter">(</span><span class="Constant">0x03</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment">// e_version</span>
-<span id="L96" class="LineNr"> 96 </span>  O<span class="Delimiter">(</span><span class="Constant">0x01</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">// e_entry</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Normal">int</span> e_entry = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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="L99" class="LineNr"> 99 </span>  emit<span class="Delimiter">(</span>e_entry<span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Comment">// e_phoff -- immediately after ELF header</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Normal">int</span> e_phoff = <span class="Constant">0x34</span><span class="Delimiter">;</span>
-<span id="L102" class="LineNr">102 </span>  emit<span class="Delimiter">(</span>e_phoff<span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Comment">// e_shoff; unused</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">int</span> dummy32 = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Comment">// e_flags; unused</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#L99'>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#L89'>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>
+<span id="L28" class="LineNr"> 28 </span>      ++i<span class="Delimiter">;</span>
+<span id="L29" class="LineNr"> 29 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt;= argc<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L30" class="LineNr"> 30 </span>        <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span>
+<span id="L31" class="LineNr"> 31 </span>        cerr &lt;&lt; <span class="Constant">&quot;'-o' must be followed by a filename to write results to</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr"> 32 </span>        exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span>      <span class="Delimiter">}</span>
+<span id="L34" class="LineNr"> 34 </span>      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>      ifstream fin<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>
+<span id="L38" class="LineNr"> 38 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!fin<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L39" class="LineNr"> 39 </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="L40" class="LineNr"> 40 </span>        <span class="Identifier">return</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>      parse<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L44" class="LineNr"> 44 </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">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L47" class="LineNr"> 47 </span>    <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span>
+<span id="L48" class="LineNr"> 48 </span>    cerr &lt;&lt; <span class="Constant">&quot;nothing to do; must provide at least one file to read</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L49" class="LineNr"> 49 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><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">if</span> <span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L52" class="LineNr"> 52 </span>    <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span>
+<span id="L53" class="LineNr"> 53 </span>    cerr &lt;&lt; <span class="Constant">&quot;must provide a filename to write to using '-o'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L54" class="LineNr"> 54 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L58" class="LineNr"> 58 </span>  <a href='028translate.cc.html#L73'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> output_filename<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#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L60" class="LineNr"> 60 </span>    unlink<span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="Identifier">return</span> <span class="Constant">1</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="Comment">// End subx translate</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Identifier">return</span> <span class="Constant">0</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='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L69" class="LineNr"> 69 </span>  cerr &lt;&lt; <span class="Constant">&quot;Usage: subx translate file1 file2 ... -o output</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">}</span>
+<span id="L71" class="LineNr"> 71 </span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment">// write out a program to a bare-bones ELF file</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> <a href='028translate.cc.html#L73'>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="L74" class="LineNr"> 74 </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="L75" class="LineNr"> 75 </span>  <a href='028translate.cc.html#L81'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span>
+<span id="L77" class="LineNr"> 77 </span>    <a href='028translate.cc.html#L175'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>  out<span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">}</span>
+<span id="L80" class="LineNr"> 80 </span>
+<span id="L81" class="LineNr"> 81 </span><span class="Normal">void</span> <a href='028translate.cc.html#L81'>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="L82" class="LineNr"> 82 </span>  <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Comment">#define O(X)  c = (X); out.write(&amp;c, sizeof(c))</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Comment">// host is required to be little-endian</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment">#define emit(X)  out.write(reinterpret_cast&lt;const char*&gt;(&amp;X), sizeof(X))</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="SalientComment">//// ehdr</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Comment">// e_ident</span>
+<span id="L88" class="LineNr"> 88 </span>  O<span class="Delimiter">(</span><span class="Constant">0x7f</span><span class="Delimiter">);</span> O<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> O<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> O<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>
+<span id="L89" class="LineNr"> 89 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// 32-bit format</span>
+<span id="L90" class="LineNr"> 90 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span>  <span class="Comment">// little-endian</span>
+<span id="L91" class="LineNr"> 91 </span>    O<span class="Delimiter">(</span><span class="Constant">0x1</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <span class="Constant">8</span><span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> O<span class="Delimiter">(</span><span class="Constant">0x0</span><span class="Delimiter">);</span> <span class="Delimiter">}</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Comment">// e_type</span>
+<span id="L94" class="LineNr"> 94 </span>  O<span class="Delimiter">(</span><span class="Constant">0x02</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Comment">// e_machine</span>
+<span id="L96" class="LineNr"> 96 </span>  O<span class="Delimiter">(</span><span class="Constant">0x03</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">// e_version</span>
+<span id="L98" class="LineNr"> 98 </span>  O<span class="Delimiter">(</span><span class="Constant">0x01</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">// e_entry</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Normal">int</span> e_entry = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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="L101" class="LineNr">101 </span>  emit<span class="Delimiter">(</span>e_entry<span class="Delimiter">);</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Comment">// e_phoff -- immediately after ELF header</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">int</span> e_phoff = <span class="Constant">0x34</span><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  emit<span class="Delimiter">(</span>e_phoff<span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Comment">// e_shoff; unused</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Normal">int</span> dummy32 = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L107" class="LineNr">107 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Comment">// e_ehsize</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">uint16_t</span> e_ehsize = <span class="Constant">0x34</span><span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>  emit<span class="Delimiter">(</span>e_ehsize<span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Comment">// e_phentsize</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Comment">// e_phnum</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Comment">// e_shentsize</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <span class="Comment">// e_shnum</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Comment">// e_flags; unused</span>
+<span id="L109" class="LineNr">109 </span>  emit<span class="Delimiter">(</span>dummy32<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Comment">// e_ehsize</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">uint16_t</span> e_ehsize = <span class="Constant">0x34</span><span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>  emit<span class="Delimiter">(</span>e_ehsize<span class="Delimiter">);</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Comment">// e_phentsize</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>  emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Comment">// e_phnum</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Comment">// e_shentsize</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span>
 <span id="L121" class="LineNr">121 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment">// e_shstrndx</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment">// e_shnum</span>
 <span id="L123" class="LineNr">123 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>
-<span id="L125" class="LineNr">125 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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="L126" class="LineNr">126 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L127" class="LineNr">127 </span>    <span class="SalientComment">//// phdr</span>
-<span id="L128" class="LineNr">128 </span>    <span class="Comment">// p_type</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>    emit<span class="Delimiter">(</span>p_type<span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Comment">// p_offset</span>
-<span id="L132" class="LineNr">132 </span>    emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>    <span class="Comment">// p_vaddr</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start<span class="Delimiter">;</span>
-<span id="L135" class="LineNr">135 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>    <span class="Comment">// p_paddr</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Comment">// e_shstrndx</span>
+<span id="L125" class="LineNr">125 </span>  emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>
+<span id="L127" class="LineNr">127 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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="L128" class="LineNr">128 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L129" class="LineNr">129 </span>    <span class="SalientComment">//// phdr</span>
+<span id="L130" class="LineNr">130 </span>    <span class="Comment">// p_type</span>
+<span id="L131" class="LineNr">131 </span>    <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </span>    emit<span class="Delimiter">(</span>p_type<span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>    <span class="Comment">// p_offset</span>
+<span id="L134" class="LineNr">134 </span>    emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>    <span class="Comment">// p_vaddr</span>
+<span id="L136" class="LineNr">136 </span>    <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start<span class="Delimiter">;</span>
 <span id="L137" class="LineNr">137 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
-<span id="L138" class="LineNr">138 </span>    <span class="Comment">// p_filesz</span>
-<span id="L139" class="LineNr">139 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L183'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L140" class="LineNr">140 </span>    assert<span class="Delimiter">(</span>p_offset + size &lt; <a href='012elf.cc.html#L135'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
-<span id="L141" class="LineNr">141 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L142" class="LineNr">142 </span>    <span class="Comment">// p_memsz</span>
+<span id="L138" class="LineNr">138 </span>    <span class="Comment">// p_paddr</span>
+<span id="L139" class="LineNr">139 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Comment">// p_filesz</span>
+<span id="L141" class="LineNr">141 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L185'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L142" class="LineNr">142 </span>    assert<span class="Delimiter">(</span>p_offset + size &lt; <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">);</span>
 <span id="L143" class="LineNr">143 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>    <span class="Comment">// p_flags</span>
-<span id="L145" class="LineNr">145 </span>    <span class="Normal">uint32_t</span> p_flags = <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> ? <span class="Comment">/*</span><span class="Comment">r-x</span><span class="Comment">*/</span><span class="Constant">0x5</span> : <span class="Comment">/*</span><span class="Comment">rw-</span><span class="Comment">*/</span><span class="Constant">0x6</span><span class="Delimiter">;</span>  <span class="Comment">// convention: only first segment is code</span>
-<span id="L146" class="LineNr">146 </span>    emit<span class="Delimiter">(</span>p_flags<span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>
-<span id="L148" class="LineNr">148 </span>    <span class="Comment">// p_align</span>
-<span id="L149" class="LineNr">149 </span>    <span class="Comment">// &quot;As the system creates or augments a process image, it logically copies</span>
-<span id="L150" class="LineNr">150 </span>    <span class="Comment">// a file's segment to a virtual memory segment.  When—and if— the system</span>
-<span id="L151" class="LineNr">151 </span>    <span class="Comment">// physically reads the file depends on the program's execution behavior,</span>
-<span id="L152" class="LineNr">152 </span>    <span class="Comment">// system load, and so on.  A process does not require a physical page</span>
-<span id="L153" class="LineNr">153 </span>    <span class="Comment">// unless it references the logical page during execution, and processes</span>
-<span id="L154" class="LineNr">154 </span>    <span class="Comment">// commonly leave many pages unreferenced. Therefore delaying physical</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Comment">// reads frequently obviates them, improving system performance. To obtain</span>
-<span id="L156" class="LineNr">156 </span>    <span class="Comment">// this efficiency in practice, executable and shared object files must</span>
-<span id="L157" class="LineNr">157 </span>    <span class="Comment">// have segment images whose file offsets and virtual addresses are</span>
-<span id="L158" class="LineNr">158 </span>    <span class="Comment">// congruent, modulo the page size.&quot; -- <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a> (page 95)</span>
-<span id="L159" class="LineNr">159 </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="L160" class="LineNr">160 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </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="L162" class="LineNr">162 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>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="L163" class="LineNr">163 </span>      <span class="Identifier">return</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">// prepare for next segment</span>
-<span id="L167" class="LineNr">167 </span>    p_offset += size<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">#undef O</span>
-<span id="L170" class="LineNr">170 </span><span class="Comment">#undef emit</span>
-<span id="L171" class="LineNr">171 </span><span class="Delimiter">}</span>
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Normal">void</span> <a href='028translate.cc.html#L173'>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="L174" class="LineNr">174 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">;</span>
-<span id="L176" class="LineNr">176 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L177" class="LineNr">177 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L273'>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="L178" class="LineNr">178 </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="L179" class="LineNr">179 </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="Delimiter">}</span>
-<span id="L182" class="LineNr">182 </span>
-<span id="L183" class="LineNr">183 </span><span class="Normal">uint32_t</span> <a href='028translate.cc.html#L183'>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="L184" class="LineNr">184 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L186" class="LineNr">186 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Identifier">return</span> sum<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="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L191" class="LineNr">191 </span><span class="Normal">using</span> std::ios<span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Comment">// p_memsz</span>
+<span id="L145" class="LineNr">145 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>    <span class="Comment">// p_flags</span>
+<span id="L147" class="LineNr">147 </span>    <span class="Normal">uint32_t</span> p_flags = <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> ? <span class="Comment">/*</span><span class="Comment">r-x</span><span class="Comment">*/</span><span class="Constant">0x5</span> : <span class="Comment">/*</span><span class="Comment">rw-</span><span class="Comment">*/</span><span class="Constant">0x6</span><span class="Delimiter">;</span>  <span class="Comment">// convention: only first segment is code</span>
+<span id="L148" class="LineNr">148 </span>    emit<span class="Delimiter">(</span>p_flags<span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span>    <span class="Comment">// p_align</span>
+<span id="L151" class="LineNr">151 </span>    <span class="Comment">// &quot;As the system creates or augments a process image, it logically copies</span>
+<span id="L152" class="LineNr">152 </span>    <span class="Comment">// a file's segment to a virtual memory segment.  When—and if— the system</span>
+<span id="L153" class="LineNr">153 </span>    <span class="Comment">// physically reads the file depends on the program's execution behavior,</span>
+<span id="L154" class="LineNr">154 </span>    <span class="Comment">// system load, and so on.  A process does not require a physical page</span>
+<span id="L155" class="LineNr">155 </span>    <span class="Comment">// unless it references the logical page during execution, and processes</span>
+<span id="L156" class="LineNr">156 </span>    <span class="Comment">// commonly leave many pages unreferenced. Therefore delaying physical</span>
+<span id="L157" class="LineNr">157 </span>    <span class="Comment">// reads frequently obviates them, improving system performance. To obtain</span>
+<span id="L158" class="LineNr">158 </span>    <span class="Comment">// this efficiency in practice, executable and shared object files must</span>
+<span id="L159" class="LineNr">159 </span>    <span class="Comment">// have segment images whose file offsets and virtual addresses are</span>
+<span id="L160" class="LineNr">160 </span>    <span class="Comment">// congruent, modulo the page size.&quot; -- <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a> (page 95)</span>
+<span id="L161" class="LineNr">161 </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="L162" class="LineNr">162 </span>    emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span>
+<span id="L163" class="LineNr">163 </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="L164" class="LineNr">164 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;segment starting at 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="L165" class="LineNr">165 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>    <span class="Delimiter">}</span>
+<span id="L167" class="LineNr">167 </span>
+<span id="L168" class="LineNr">168 </span>    <span class="Comment">// prepare for next segment</span>
+<span id="L169" class="LineNr">169 </span>    p_offset += size<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">#undef O</span>
+<span id="L172" class="LineNr">172 </span><span class="Comment">#undef emit</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='028translate.cc.html#L175'>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="L176" class="LineNr">176 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L177" class="LineNr">177 </span>    <span class="Normal">const</span> vector&lt;word&gt;&amp; w = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">;</span>
+<span id="L178" class="LineNr">178 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L179" class="LineNr">179 </span>      <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L273'>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="L180" class="LineNr">180 </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="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="Normal">uint32_t</span> <a href='028translate.cc.html#L185'>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="L186" class="LineNr">186 </span>  <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L188" class="LineNr">188 </span>    sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Identifier">return</span> sum<span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
+<span id="L191" class="LineNr">191 </span>
+<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L193" class="LineNr">193 </span><span class="Normal">using</span> std::ios<span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index af7cf865..9d367fd8 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -75,13 +75,13 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Comment">//: pack and order the bytes corresponding to the operands in an instruction.</span>
 <span id="L14" class="LineNr"> 14 </span>
 <span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L16" class="LineNr"> 16 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;instructions&quot;</span><span class="Delimiter">,</span>
+<span id="L16" class="LineNr"> 16 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;instructions&quot;</span><span class="Delimiter">,</span>
 <span id="L17" class="LineNr"> 17 </span>  <span class="Constant">&quot;Each x86 instruction consists of an instruction or opcode and some number</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L18" class="LineNr"> 18 </span>  <span class="Constant">&quot;of operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;Each instruction has some set of allowed operand types. It'll reject others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L418'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L417'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;Each of these has its own help page. Try reading 'subx help mod' next.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -91,428 +91,430 @@ if ('onhashchange' in window) {
 <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><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L34" class="LineNr"> 34 </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="L35" class="LineNr"> 35 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
-<span id="L36" class="LineNr"> 36 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
-<span id="L37" class="LineNr"> 37 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L39" class="LineNr"> 39 </span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: complete set of valid operand types</span>
-<span id="L41" class="LineNr"> 41 </span>
-<span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L43" class="LineNr"> 43 </span>set&lt;string&gt; <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">;</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L45" class="LineNr"> 45 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;subop&quot;</span><span class="Delimiter">);</span>
-<span id="L46" class="LineNr"> 46 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;mod&quot;</span><span class="Delimiter">);</span>
-<span id="L47" class="LineNr"> 47 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L48" class="LineNr"> 48 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;base&quot;</span><span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;index&quot;</span><span class="Delimiter">);</span>
-<span id="L50" class="LineNr"> 50 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;scale&quot;</span><span class="Delimiter">);</span>
-<span id="L51" class="LineNr"> 51 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;r32&quot;</span><span class="Delimiter">);</span>
-<span id="L52" class="LineNr"> 52 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">);</span>
-<span id="L54" class="LineNr"> 54 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">);</span>
-<span id="L56" class="LineNr"> 56 </span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
-<span id="L57" class="LineNr"> 57 </span>
-<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">:(before &quot;End <a href='001help.cc.html#L53'>Help</a> Texts&quot;)</span>
-<span id="L59" class="LineNr"> 59 </span><a href='030---operands.cc.html#L61'>init_operand_type_help</a><span class="Delimiter">();</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(code)</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L61'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;2-bit operand controlling the _addressing mode_ of many instructions,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;to determine how to compute the _effective address_ to look up memory at</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;If mod = 3, just operate on the <a href='003trace.cc.html#L74'>contents</a> of the register specified by rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;            (direct mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;If mod = 2, effective address is usually* rm32 + disp32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L70" class="LineNr"> 70 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L71" class="LineNr"> 71 </span>    <span class="Constant">&quot;If mod = 1, effective address is usually* rm32 + disp8</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L72" class="LineNr"> 72 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="Constant">&quot;If mod = 0, effective address is usually* rm32 (indirect mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;(* - The exception is when rm32 is '4'. Register 4 is the stack pointer (ESP).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Constant">&quot;     Using it as an address gets more involved. For more details,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;     try reading the help pages for 'base', 'index' and 'scale'.)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L79" class="LineNr"> 79 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L80" class="LineNr"> 80 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span>
-<span id="L83" class="LineNr"> 83 </span>    <span class="Constant">&quot;Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L84" class="LineNr"> 84 </span>    <span class="Constant">&quot;Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span>
-<span id="L87" class="LineNr"> 87 </span>    <span class="Constant">&quot;3-bit operand specifying a register operand used directly, without any further addressing modes.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span>
-<span id="L90" class="LineNr"> 90 </span>    <span class="Constant">&quot;32-bit value in register or memory. The precise details of its construction depend on the eponymous 3-bit</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;'rm32' operand, the 'mod' operand, and also potentially the 'SIB' operands ('scale', 'index' and 'base')</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L92" class="LineNr"> 92 </span>    <span class="Constant">&quot;and a displacement ('disp8' or 'disp32').</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L93" class="LineNr"> 93 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-2,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L95" class="LineNr"> 95 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Delimiter">);</span>
-<span id="L97" class="LineNr"> 97 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span>
-<span id="L98" class="LineNr"> 98 </span>    <span class="Constant">&quot;Additional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) specifying the register containing an address to look up.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L100" class="LineNr">100 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L101" class="LineNr">101 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L103" class="LineNr">103 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span>
-<span id="L106" class="LineNr">106 </span>    <span class="Constant">&quot;Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to the 'base' operand to compute the 'effective address' at which to look up memory.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L107" class="LineNr">107 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L108" class="LineNr">108 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;scale&quot;</span><span class="Delimiter">,</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Constant">&quot;Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be multiplied to the 'index' operand before adding the result to the 'base' operand to compute the _effective address_ to operate on.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L114" class="LineNr">114 </span>    <span class="Constant">&quot;  effective address = base + index * scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Constant">&quot;For complete details consult the IA-32 software developer's manual, table 2-3,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing forms with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L117" class="LineNr">117 </span>    <span class="Constant">&quot;  <a href="https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf">https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">,</span>
-<span id="L120" class="LineNr">120 </span>    <span class="Constant">&quot;8-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">,</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Constant">&quot;16-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">,</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Constant">&quot;32-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm8&quot;</span><span class="Delimiter">,</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Constant">&quot;8-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">,</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Constant">&quot;32-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L133" class="LineNr">133 </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="SalientComment">//:: transform packing operands into bytes in the right order</span>
-<span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(after &quot;Begin Transforms&quot;)</span>
-<span id="L139" class="LineNr">139 </span><span class="Comment">// Begin Level-2 Transforms</span>
-<span id="L140" class="LineNr">140 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span>
-<span id="L141" class="LineNr">141 </span><span class="Comment">// End Level-2 Transforms</span>
-<span id="L142" class="LineNr">142 </span>
-<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(code)</span>
-<span id="L144" class="LineNr">144 </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="L145" class="LineNr">145 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Comment">// Pack Operands(segment code)</span>
-<span id="L148" class="LineNr">148 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- pack operands&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L150" class="LineNr">150 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L151" class="LineNr">151 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L377'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L204'>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="L153" class="LineNr">153 </span>    pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L154" class="LineNr">154 </span>    <a href='003trace.cc.html#L204'>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="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> pack_operands<span class="Delimiter">(</span>line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>  <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L160" class="LineNr">160 </span>  <a href='030---operands.cc.html#L168'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L161" class="LineNr">161 </span>  <a href='030---operands.cc.html#L178'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L162" class="LineNr">162 </span>  <a href='030---operands.cc.html#L204'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L163" class="LineNr">163 </span>  <a href='030---operands.cc.html#L226'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L164" class="LineNr">164 </span>  <a href='030---operands.cc.html#L238'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span>
-<span id="L165" class="LineNr">165 </span>  inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">}</span>
-<span id="L167" class="LineNr">167 </span>
-<span id="L168" class="LineNr">168 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L168'>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="L169" class="LineNr">169 </span>  out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
-<span id="L171" class="LineNr">171 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L173" class="LineNr">173 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L175" class="LineNr">175 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span>
-<span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L178'>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="L179" class="LineNr">179 </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="L180" class="LineNr">180 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L183" class="LineNr">183 </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="L184" class="LineNr">184 </span>      mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L185" class="LineNr">185 </span>      emit =<span class="Constant"> true</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="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="L188" class="LineNr">188 </span>      rm32 = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L189" class="LineNr">189 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L190" class="LineNr">190 </span>    <span class="Delimiter">}</span>
-<span id="L191" class="LineNr">191 </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="L192" class="LineNr">192 </span>      reg_subop = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span>    <span class="Delimiter">}</span>
-<span id="L195" class="LineNr">195 </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="L196" class="LineNr">196 </span>      reg_subop = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L197" class="LineNr">197 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L198" class="LineNr">198 </span>    <span class="Delimiter">}</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Delimiter">}</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L201" class="LineNr">201 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L268'>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="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='030---operands.cc.html#L204'>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="L205" class="LineNr">205 </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="L206" class="LineNr">206 </span>  <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L208" class="LineNr">208 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </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="L210" class="LineNr">210 </span>      scale = <a href='011run.cc.html#L273'>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;index&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L214" class="LineNr">214 </span>      index = <a href='011run.cc.html#L273'>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="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="L218" class="LineNr">218 </span>      base = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span>      emit =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L220" class="LineNr">220 </span>    <span class="Delimiter">}</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Delimiter">}</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span>
-<span id="L223" class="LineNr">223 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L268'>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="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='030---operands.cc.html#L226'>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="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#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L228" class="LineNr">228 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L229" class="LineNr">229 </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="L230" class="LineNr">230 </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="L231" class="LineNr">231 </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="L232" class="LineNr">232 </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="L233" class="LineNr">233 </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="L234" class="LineNr">234 </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="L235" class="LineNr">235 </span>  <span class="Delimiter">}</span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
-<span id="L237" class="LineNr">237 </span>
-<span id="L238" class="LineNr">238 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L238'>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="L239" class="LineNr">239 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L240" class="LineNr">240 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L241" class="LineNr">241 </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="L242" class="LineNr">242 </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="L243" class="LineNr">243 </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="L244" class="LineNr">244 </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="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> 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="L249" class="LineNr">249 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>  <span class="Normal">bool</span> is_number = <a href='030---operands.cc.html#L437'>looks_like_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L251" class="LineNr">251 </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="L252" class="LineNr">252 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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="L253" class="LineNr">253 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>is_number<span class="Delimiter">)</span>
-<span id="L254" class="LineNr">254 </span>      out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L275'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">));</span>
-<span id="L255" class="LineNr">255 </span>    <span class="Identifier">return</span><span class="Delimiter">;</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 imm32 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; <a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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><a href='030---operands.cc.html#L40'>Instruction_operands</a><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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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,</span><span class="cSpecial">\n</span><span class="Constant">&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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="Constant">&quot;based on the 'rm32' operand and potentially others.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&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#L74'>contents</a> of the register specified by rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;            (direct mode).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;If mod = 2, effective address is usually* rm32 + disp32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;If mod = 1, effective address is usually* rm32 + disp8</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;            (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="Constant">&quot;If mod = 0, effective address is usually* rm32 (indirect mode).</span><span class="cSpecial">\n</span><span class="Constant">&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).</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L72" class="LineNr"> 72 </span>    <span class="Constant">&quot;     Using it as an address gets more involved. For more details,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="Constant">&quot;     try reading the help pages for 'base', 'index' and 'scale'.)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Constant">&quot;developer's manual that are also included in this repo:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L77" class="LineNr"> 77 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the ModR/M byte.</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the SIB byte.</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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</span><span class="cSpecial">\n</span><span class="Constant">&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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="Constant">&quot;potentially the 'SIB' operands ('scale', 'index' and 'base') and a displacement</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="Constant">&quot;('disp8' or 'disp32').</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="Constant">&quot;developer's manual that are also included in this repo:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="Constant">&quot;  - modrm.pdf: volume 2, table 2-2, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the ModR/M byte.</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Constant">&quot;  - sib.pdf: volume 2, table 2-3, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the SIB byte.</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L100" class="LineNr">100 </span>    <span class="Constant">&quot;register containing an address to look up.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L101" class="LineNr">101 </span>    <span class="Constant">&quot;This address may be further modified by 'index' and 'scale' operands.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L102" class="LineNr">102 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&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,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L104" class="LineNr">104 </span>    <span class="Constant">&quot;volume 2, table 2-3, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L105" class="LineNr">105 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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</span><span class="cSpecial">\n</span><span class="Constant">&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.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L110" class="LineNr">110 </span>    <span class="Constant">&quot;  effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&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,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L112" class="LineNr">112 </span>    <span class="Constant">&quot;volume 2, table 2-3, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L113" class="LineNr">113 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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</span><span class="cSpecial">\n</span><span class="Constant">&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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L118" class="LineNr">118 </span>    <span class="Constant">&quot;the 'base' operand to compute the _effective address_ to operate on.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L119" class="LineNr">119 </span>    <span class="Constant">&quot;  effective address = base + index * scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L120" class="LineNr">120 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L121" class="LineNr">121 </span>    <span class="Constant">&quot;When scale is 0, use index unmodified.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L122" class="LineNr">122 </span>    <span class="Constant">&quot;When scale is 1, multiply index by 2.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L123" class="LineNr">123 </span>    <span class="Constant">&quot;When scale is 2, multiply index by 4.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Constant">&quot;When scale is 3, multiply index by 8.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L125" class="LineNr">125 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&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,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L127" class="LineNr">127 </span>    <span class="Constant">&quot;volume 2, table 2-3, </span><span class="cSpecial">\&quot;</span><span class="Constant">32-bit addressing with the SIB byte</span><span class="cSpecial">\&quot;</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L128" class="LineNr">128 </span>    <span class="Constant">&quot;It is included in this repository as 'sib.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><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.</span><span class="cSpecial">\n</span><span class="Constant">&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><a href='011run.cc.html#L229'>Transform</a><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="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#L100'>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#L100'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- 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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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#L109'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L117'>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#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span>
+<span id="L182" class="LineNr">182 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L184" class="LineNr">184 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> &amp;&amp; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L186" class="LineNr">186 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L193" class="LineNr">193 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="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#L273'>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#L273'>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#L273'>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#L273'>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#L118'>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#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L219" class="LineNr">219 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="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#L273'>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#L273'>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#L273'>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#L118'>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#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L239" class="LineNr">239 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="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#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L251" class="LineNr">251 </span>    <span class="Normal">const</span> word&amp; curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="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>  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#L362'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">)),</span> num<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="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="L261" class="LineNr">261 </span>  assert<span class="Delimiter">(</span>num &lt;= <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </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="L263" class="LineNr">263 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L268'>hex_byte_text</a><span class="Delimiter">(</span>val &amp; <span class="Constant">0xff</span><span class="Delimiter">));</span>
-<span id="L264" class="LineNr">264 </span>    val = val &gt;&gt; <span class="Constant">8</span><span class="Delimiter">;</span>
-<span id="L265" class="LineNr">265 </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><a href='011run.cc.html#L123'>word</a> <a href='030---operands.cc.html#L268'>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="L269" class="LineNr">269 </span>  <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span>
-<span id="L270" class="LineNr">270 </span>  result<span class="Delimiter">.</span>data = <a href='030---operands.cc.html#L275'>hex_byte_to_string</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L271" class="LineNr">271 </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="L272" class="LineNr">272 </span>  <span class="Identifier">return</span> result<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>string <a href='030---operands.cc.html#L275'>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="L276" class="LineNr">276 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L277" class="LineNr">277 </span>  <span class="Comment">// uint8_t prints without padding, but int8_t will expand to 32 bits again</span>
-<span id="L278" class="LineNr">278 </span>  out &lt;&lt; <a href='010---vm.cc.html#L367'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L370'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<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>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="L283" class="LineNr">283 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L284" class="LineNr">284 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr">285 </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="L286" class="LineNr">286 </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="L287" class="LineNr">287 </span>  <span class="Delimiter">}</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<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="Delimiter">:(before &quot;End Unit Tests&quot;)</span>
-<span id="L292" class="LineNr">292 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L292'>test_preserve_metadata_when_emitting_single_byte</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L293" class="LineNr">293 </span>  <a href='011run.cc.html#L123'>word</a> in<span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span>  in<span class="Delimiter">.</span>data = <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">;</span>
-<span id="L295" class="LineNr">295 </span>  in<span class="Delimiter">.</span>original = <span class="Constant">&quot;f0/foo&quot;</span><span class="Delimiter">;</span>
-<span id="L296" class="LineNr">296 </span>  <a href='011run.cc.html#L117'>line</a> out<span class="Delimiter">;</span>
-<span id="L297" class="LineNr">297 </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="L298" class="LineNr">298 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;f0&quot;</span><span class="Delimiter">);</span>
-<span id="L299" class="LineNr">299 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original<span class="Delimiter">,</span> <span class="Constant">&quot;f0/foo&quot;</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#L118'>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#L118'>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#L362'>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#L362'>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#L118'>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#L123'>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#L123'>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="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#L402'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L405'>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="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="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#L157'>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">:(scenario pack_disp8)</span>
-<span id="L303" class="LineNr">303 </span>== <span class="Constant">0x1</span>
-<span id="L304" class="LineNr">304 </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="L305" class="LineNr">305 </span><span class="traceContains">+transform: packing instruction '74 2/disp8'</span>
-<span id="L306" class="LineNr">306 </span><span class="traceContains">+transform: instruction after packing: '74 02'</span>
-<span id="L307" class="LineNr">307 </span>
-<span id="L308" class="LineNr">308 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(scenario pack_disp8_negative)</span>
-<span id="L310" class="LineNr">310 </span>== <span class="Constant">0x1</span>
-<span id="L311" class="LineNr">311 </span><span class="Comment"># running this will cause an infinite loop</span>
-<span id="L312" class="LineNr">312 </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="L313" class="LineNr">313 </span><span class="traceContains">+transform: packing instruction '74 -1/disp8'</span>
-<span id="L314" class="LineNr">314 </span><span class="traceContains">+transform: instruction after packing: '74 ff'</span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="Comment">//: helper for scenario</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='011run.cc.html#L231'>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="L320" class="LineNr">320 </span>  <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span>
-<span id="L321" class="LineNr">321 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L322" class="LineNr">322 </span>  parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L324" class="LineNr">324 </span>  <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<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">:(scenario pack_modrm_imm32)</span>
-<span id="L328" class="LineNr">328 </span>== <span class="Constant">0x1</span>
-<span id="L329" class="LineNr">329 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L330" class="LineNr">330 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L331" class="LineNr">331 </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="L332" class="LineNr">332 </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="L333" class="LineNr">333 </span><span class="traceContains">+transform: packing instruction '81 0/add/subop 3/mod/direct 3/ebx/rm32 1/imm32'</span>
-<span id="L334" class="LineNr">334 </span><span class="traceContains">+transform: instruction after packing: '81 c3 01 00 00 00'</span>
-<span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario pack_imm32_large)</span>
-<span id="L337" class="LineNr">337 </span>== <span class="Constant">0x1</span>
-<span id="L338" class="LineNr">338 </span>b9 <span class="Constant">0x080490a7</span>/imm32  <span class="Comment"># copy to ECX</span>
-<span id="L339" class="LineNr">339 </span><span class="traceContains">+transform: packing instruction 'b9 0x080490a7/imm32'</span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+transform: instruction after packing: 'b9 a7 90 04 08'</span>
-<span id="L341" class="LineNr">341 </span>
-<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(scenario pack_immediate_constants_hex)</span>
-<span id="L343" class="LineNr">343 </span>== <span class="Constant">0x1</span>
-<span id="L344" class="LineNr">344 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L345" class="LineNr">345 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
-<span id="L348" class="LineNr">348 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
-<span id="L349" class="LineNr">349 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L350" class="LineNr">350 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L351" class="LineNr">351 </span>
-<span id="L352" class="LineNr">352 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L353" class="LineNr">353 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
-<span id="L354" class="LineNr">354 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L355" class="LineNr">355 </span>== <span class="Constant">0x1</span>
-<span id="L356" class="LineNr">356 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L357" class="LineNr">357 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</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</span>
-<span id="L359" class="LineNr">359 </span>  bb                                                                                                                              foo/imm32         <span class="Comment"># copy to EBX</span>
-<span id="L360" class="LineNr">360 </span><span class="traceContains">+transform: packing instruction 'bb foo/imm32'</span>
-<span id="L361" class="LineNr">361 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
-<span id="L362" class="LineNr">362 </span><span class="traceContains">+transform: instruction after packing: 'bb foo'</span>
-<span id="L363" class="LineNr">363 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L364" class="LineNr">364 </span>
-<span id="L365" class="LineNr">365 </span><span class="Delimiter">:(scenario pack_flags_bad_hex)</span>
-<span id="L366" class="LineNr">366 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L367" class="LineNr">367 </span>== <span class="Constant">0x1</span>
-<span id="L368" class="LineNr">368 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L369" class="LineNr">369 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L370" class="LineNr">370 </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="L371" class="LineNr">371 </span>  bb                                                                                                                              0xfoo/imm32       <span class="Comment"># copy to EBX</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+error: not a number: 0xfoo</span>
-<span id="L373" class="LineNr">373 </span>
-<span id="L374" class="LineNr">374 </span><span class="SalientComment">//:: helpers</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#L123'>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#L117'>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#L118'>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#L118'>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#L231'>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#L99'>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#L224'>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#L231'>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="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 imm32 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="Delimiter">:(code)</span>
-<span id="L377" class="LineNr">377 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L377'>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="L378" class="LineNr">378 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L379" class="LineNr">379 </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#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span>
-<span id="L380" class="LineNr">380 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Identifier">return</span><span class="Constant"> true</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="Normal">bool</span> <a href='030---operands.cc.html#L384'>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="L385" class="LineNr">385 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L394'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L386" class="LineNr">386 </span>    <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L387" class="LineNr">387 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>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="L376" class="LineNr">376 </span><span class="SalientComment">//:: helpers</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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span 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#L118'>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>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="L389" class="LineNr">389 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>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="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">}</span>
-<span id="L393" class="LineNr">393 </span>
-<span id="L394" class="LineNr">394 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L394'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; <a href='011run.cc.html#L123'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L395" class="LineNr">395 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L396" class="LineNr">396 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>end<span class="Delimiter">())</span>
-<span id="L397" class="LineNr">397 </span>      <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">}</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Normal">bool</span> has_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="L402" class="LineNr">402 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L404" class="LineNr">404 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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="L405" class="LineNr">405 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L406" class="LineNr">406 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L407" class="LineNr">407 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L408" class="LineNr">408 </span>    <span class="Delimiter">}</span>
-<span id="L409" class="LineNr">409 </span>    result =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span>  <span class="Identifier">return</span> result<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="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="L415" class="LineNr">415 </span>  <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</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#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L418" class="LineNr">418 </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="L419" class="LineNr">419 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <a href='030---operands.cc.html#L43'>Instruction_operands</a><span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L420" class="LineNr">420 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L421" class="LineNr">421 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L422" class="LineNr">422 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L423" class="LineNr">423 </span>    <span class="Delimiter">}</span>
-<span id="L424" class="LineNr">424 </span>    metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L425" class="LineNr">425 </span>    result = <span class="Delimiter">(</span>curr == m<span class="Delimiter">);</span>
-<span id="L426" class="LineNr">426 </span>  <span class="Delimiter">}</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Identifier">return</span> result<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><a href='011run.cc.html#L123'>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="L431" class="LineNr">431 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L432" class="LineNr">432 </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#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span>
-<span id="L433" class="LineNr">433 </span>      <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L434" class="LineNr">434 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</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="Normal">bool</span> <a href='030---operands.cc.html#L437'>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="L438" class="LineNr">438 </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="L439" class="LineNr">439 </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="L440" class="LineNr">440 </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="L441" class="LineNr">441 </span>  <span class="Comment">// End looks_like_hex_int(s) Detectors</span>
-<span id="L442" class="LineNr">442 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L443" class="LineNr">443 </span><span class="Delimiter">}</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>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="L447" class="LineNr">447 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L448" class="LineNr">448 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L449" class="LineNr">449 </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="L450" class="LineNr">450 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span>
-<span id="L451" class="LineNr">451 </span>  <span class="Delimiter">}</span>
-<span id="L452" class="LineNr">452 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L453" class="LineNr">453 </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#L123'>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#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>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><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='030---operands.cc.html#L40'>Instruction_operands</a><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="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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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#L118'>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#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' has conflicting &quot;</span> &lt;&lt; m &lt;&lt; <span class="Constant">&quot; operands</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; 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="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#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <a href='030---operands.cc.html#L40'>Instruction_operands</a><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#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&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#L123'>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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span 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#L118'>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#L118'>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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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#L118'>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>
 </pre>
 </body>
 </html>
diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html
index 34ce47b6..4d11af3e 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -68,541 +68,548 @@ if ('onhashchange' in window) {
 <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><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L9" class="LineNr">  9 </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="L10" class="LineNr"> 10 </span>  cd                                                                                                                                                <span class="Comment"># int ??</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+error: 'cd' (software interrupt): missing imm8 operand</span>
-<span id="L12" class="LineNr"> 12 </span>
-<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;Pack Operands(segment code)&quot;)</span>
-<span id="L14" class="LineNr"> 14 </span>check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L16" class="LineNr"> 16 </span>
-<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(code)</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L19" class="LineNr"> 19 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operands&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L21" class="LineNr"> 21 </span>    check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L22" class="LineNr"> 22 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Delimiter">}</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Delimiter">}</span>
-<span id="L25" class="LineNr"> 25 </span>
-<span id="L26" class="LineNr"> 26 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L27" class="LineNr"> 27 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Delimiter">}</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L472'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
-<span id="L36" class="LineNr"> 36 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
-<span id="L38" class="LineNr"> 38 </span>
-<span id="L39" class="LineNr"> 39 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L529'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
-<span id="L41" class="LineNr"> 41 </span>  <span class="Comment">// opcodes can't be negative</span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
-<span id="L43" class="LineNr"> 43 </span>    op<span class="Delimiter">.</span>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="L44" class="LineNr"> 44 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L45" class="LineNr"> 45 </span>    op<span class="Delimiter">.</span>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="L46" class="LineNr"> 46 </span>  <span class="Identifier">return</span> op<span class="Delimiter">;</span>
-<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">}</span>
-<span id="L48" class="LineNr"> 48 </span>
-<span id="L49" class="LineNr"> 49 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L49'>test_preprocess_op</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L50" class="LineNr"> 50 </span>  <a href='011run.cc.html#L123'>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="L51" class="LineNr"> 51 </span>  <a href='011run.cc.html#L123'>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="L52" class="LineNr"> 52 </span>  <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>w1<span class="Delimiter">).</span>data<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>w2<span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Delimiter">}</span>
-<span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment">//: for each supported opcode in a bitvector. That way we can often compute the</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: bitvector for each instruction's operands and compare it with the expected.</span>
-<span id="L58" class="LineNr"> 58 </span>
-<span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L60'>operand_type</a> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Comment">// start from the least significant bit</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
-<span id="L63" class="LineNr"> 63 </span>  <a href='031check_operands.cc.html#L63'>SUBOP</a><span class="Delimiter">,</span>
-<span id="L64" class="LineNr"> 64 </span>  <a href='031check_operands.cc.html#L64'>DISP8</a><span class="Delimiter">,</span>
-<span id="L65" class="LineNr"> 65 </span>  <a href='031check_operands.cc.html#L65'>DISP16</a><span class="Delimiter">,</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">,</span>
-<span id="L67" class="LineNr"> 67 </span>  <a href='031check_operands.cc.html#L67'>IMM8</a><span class="Delimiter">,</span>
-<span id="L68" class="LineNr"> 68 </span>  <a href='031check_operands.cc.html#L68'>IMM32</a><span class="Delimiter">,</span>
-<span id="L69" class="LineNr"> 69 </span>  <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a>
-<span id="L70" class="LineNr"> 70 </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>vector&lt;string&gt; <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">;</span>
-<span id="L73" class="LineNr"> 73 </span>map&lt;string<span class="Delimiter">,</span> operand_type&gt; <a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">;</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L75" class="LineNr"> 75 </span><a href='031check_operands.cc.html#L77'>init_op_types</a><span class="Delimiter">();</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(code)</span>
-<span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L77'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L78" class="LineNr"> 78 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a> &lt;= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </span>  <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
-<span id="L81" class="LineNr"> 81 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L63'>SUBOP</a><span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>DISP8</a><span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L65'>DISP16</a><span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">);</span>
-<span id="L86" class="LineNr"> 86 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L67'>IMM8</a><span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L68'>IMM32</a><span class="Delimiter">);</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Comment">#undef DEF</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L92" class="LineNr"> 92 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L93'>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="L94" class="LineNr"> 94 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L95" class="LineNr"> 95 </span><a href='031check_operands.cc.html#L97'>init_permitted_operands</a><span class="Delimiter">();</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='031check_operands.cc.html#L97'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">// halt</span>
-<span id="L100" class="LineNr">100 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Comment">// inc</span>
-<span id="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;42&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;43&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;44&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;45&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;46&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Comment">// dec</span>
-<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;48&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;49&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;4a&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;4b&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;4c&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;4d&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;4e&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <span class="Comment">// push</span>
-<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Comment">// pop</span>
-<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Comment">// return</span>
-<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>
-<span id="L140" class="LineNr">140 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
-<span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment">// jump</span>
-<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;75&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7c&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7d&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7e&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span>  <span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L156" class="LineNr">156 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
-<span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L161" class="LineNr">161 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
-<span id="L162" class="LineNr">162 </span>
-<span id="L163" class="LineNr">163 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
-<span id="L166" class="LineNr">166 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
-<span id="L167" class="LineNr">167 </span>
-<span id="L168" class="LineNr">168 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
-<span id="L171" class="LineNr">171 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
-<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
-<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
-<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
-<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
-<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
-<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Comment">// copy</span>
-<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L187" class="LineNr">187 </span>
-<span id="L188" class="LineNr">188 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L190" class="LineNr">190 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span>  <span class="Comment">// add</span>
-<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L194" class="LineNr">194 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Comment">// subtract</span>
-<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;2b&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">// and</span>
-<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;23&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">// or</span>
-<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;0b&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">// xor</span>
-<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;33&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">// compare</span>
-<span id="L208" class="LineNr">208 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Comment">// copy</span>
-<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L213" class="LineNr">213 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L214" class="LineNr">214 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Comment">// swap</span>
-<span id="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment">// lea</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Comment">// pop</span>
-<span id="L220" class="LineNr">220 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L226" class="LineNr">226 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
-<span id="L227" class="LineNr">227 </span>
-<span id="L228" class="LineNr">228 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L231" class="LineNr">231 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
-<span id="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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="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#L224'>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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check 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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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#L109'>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#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
+<span id="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#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L26" class="LineNr"> 26 </span>    <a href='031check_operands.cc.html#L503'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L30" class="LineNr"> 30 </span>    <a href='031check_operands.cc.html#L471'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L31" class="LineNr"> 31 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Delimiter">}</span>
+<span id="L33" class="LineNr"> 33 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
+<span id="L35" class="LineNr"> 35 </span>
+<span id="L36" class="LineNr"> 36 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L536'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// opcodes can't be negative</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
+<span id="L40" class="LineNr"> 40 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>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#L123'>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#L123'>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">//: bitvector for each instruction's operands and compare it with the expected.</span>
+<span id="L55" class="LineNr"> 55 </span>
+<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L57'>operand_type</a> <span class="Delimiter">{</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// start from the least significant bit</span>
+<span id="L59" class="LineNr"> 59 </span>  <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
+<span id="L60" class="LineNr"> 60 </span>  <a href='031check_operands.cc.html#L60'>SUBOP</a><span class="Delimiter">,</span>
+<span id="L61" class="LineNr"> 61 </span>  <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">,</span>
+<span id="L62" class="LineNr"> 62 </span>  <a href='031check_operands.cc.html#L62'>DISP16</a><span class="Delimiter">,</span>
+<span id="L63" class="LineNr"> 63 </span>  <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">,</span>
+<span id="L64" class="LineNr"> 64 </span>  <a href='031check_operands.cc.html#L64'>IMM8</a><span class="Delimiter">,</span>
+<span id="L65" class="LineNr"> 65 </span>  <a href='031check_operands.cc.html#L65'>IMM32</a><span class="Delimiter">,</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a>
+<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">};</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L69" class="LineNr"> 69 </span>vector&lt;string&gt; <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">;</span>
+<span id="L70" class="LineNr"> 70 </span>map&lt;string<span class="Delimiter">,</span> operand_type&gt; <a href='031check_operands.cc.html#L70'>Operand_type</a><span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L72" class="LineNr"> 72 </span><a href='031check_operands.cc.html#L74'>init_op_types</a><span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(code)</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L74'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L75" class="LineNr"> 75 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>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="L76" class="LineNr"> 76 </span>  <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
+<span id="L78" class="LineNr"> 78 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L60'>SUBOP</a><span class="Delimiter">);</span>
+<span id="L80" class="LineNr"> 80 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L62'>DISP16</a><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>IMM8</a><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L65'>IMM32</a><span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">#undef DEF</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">:(before &quot;End Globals&quot;)</span>
+<span id="L89" class="LineNr"> 89 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">;</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L90'>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="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L92" class="LineNr"> 92 </span><a href='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">();</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='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">// halt</span>
+<span id="L97" class="LineNr"> 97 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L98" class="LineNr"> 98 </span>  <span class="Comment">// inc</span>
+<span id="L99" class="LineNr"> 99 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L100" class="LineNr">100 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L101" class="LineNr">101 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L103" class="LineNr">103 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L106" class="LineNr">106 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L107" class="LineNr">107 </span>  <span class="Comment">// dec</span>
+<span id="L108" class="LineNr">108 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L112" class="LineNr">112 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L116" class="LineNr">116 </span>  <span class="Comment">// push</span>
+<span id="L117" class="LineNr">117 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L125" class="LineNr">125 </span>  <span class="Comment">// pop</span>
+<span id="L126" class="LineNr">126 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L134" class="LineNr">134 </span>  <span class="Comment">// return</span>
+<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L136" class="LineNr">136 </span>
+<span id="L137" class="LineNr">137 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
+<span id="L138" class="LineNr">138 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
+<span id="L140" class="LineNr">140 </span>
+<span id="L141" class="LineNr">141 </span>  <span class="Comment">// jump</span>
+<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L144" class="LineNr">144 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span>  <span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>  <span class="Comment">// jump</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#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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>
+<span id="L160" class="LineNr">160 </span>  <span class="SalientComment">//// Class E: just op and imm8</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     1     0      |0       0     0     0</span>
+<span id="L163" class="LineNr">163 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L164" class="LineNr">164 </span>
+<span id="L165" class="LineNr">165 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
+<span id="L168" class="LineNr">168 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L171" class="LineNr">171 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L175" class="LineNr">175 </span>  <span class="Comment">// copy</span>
+<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L180" class="LineNr">180 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L181" class="LineNr">181 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L182" class="LineNr">182 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L183" class="LineNr">183 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L188" class="LineNr">188 </span>
+<span id="L189" class="LineNr">189 </span>  <span class="Comment">// add</span>
+<span id="L190" class="LineNr">190 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L191" class="LineNr">191 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L192" class="LineNr">192 </span>  <span class="Comment">// subtract</span>
+<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L194" class="LineNr">194 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L195" class="LineNr">195 </span>  <span class="Comment">// and</span>
+<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L198" class="LineNr">198 </span>  <span class="Comment">// or</span>
+<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L201" class="LineNr">201 </span>  <span class="Comment">// xor</span>
+<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L203" class="LineNr">203 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L204" class="LineNr">204 </span>  <span class="Comment">// compare</span>
+<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Comment">// copy</span>
+<span id="L208" class="LineNr">208 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Comment">// swap</span>
+<span id="L213" class="LineNr">213 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Comment">// lea</span>
+<span id="L215" class="LineNr">215 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L216" class="LineNr">216 </span>  <span class="Comment">// pop</span>
+<span id="L217" class="LineNr">217 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L218" class="LineNr">218 </span>
+<span id="L219" class="LineNr">219 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
+<span id="L220" class="LineNr">220 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
+<span id="L222" class="LineNr">222 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><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="L223" class="LineNr">223 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
+<span id="L224" class="LineNr">224 </span>
+<span id="L225" class="LineNr">225 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</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">//  1     0     0      |0       0     0     1</span>
+<span id="L228" class="LineNr">228 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L229" class="LineNr">229 </span>
+<span id="L230" class="LineNr">230 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L233" class="LineNr">233 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L234" class="LineNr">234 </span>
+<span id="L235" class="LineNr">235 </span>  <span class="Comment">// End Init Permitted Operands</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">// End Init Permitted Operands</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">:(code)</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L243" class="LineNr">243 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L244" class="LineNr">244 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L245" class="LineNr">245 </span>
-<span id="L246" class="LineNr">246 </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="L247" class="LineNr">247 </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="L248" class="LineNr">248 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L250" class="LineNr">250 </span>    <a href='031check_operands.cc.html#L342'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L251" class="LineNr">251 </span>    <a href='031check_operands.cc.html#L369'>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="L238" class="LineNr">238 </span><span class="Delimiter">:(code)</span>
+<span id="L239" class="LineNr">239 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L240" class="LineNr">240 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L241" class="LineNr">241 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L242" class="LineNr">242 </span>
+<span id="L243" class="LineNr">243 </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="L244" class="LineNr">244 </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="L245" class="LineNr">245 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>    <a href='031check_operands.cc.html#L341'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L248" class="LineNr">248 </span>    <a href='031check_operands.cc.html#L368'>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="L249" class="LineNr">249 </span>  <span class="Delimiter">}</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L251" class="LineNr">251 </span>    <a href='031check_operands.cc.html#L257'>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="L252" class="LineNr">252 </span>  <span class="Delimiter">}</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L254" class="LineNr">254 </span>    <a href='031check_operands.cc.html#L260'>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="L255" class="LineNr">255 </span>  <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><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
-<span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L260'>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="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L377'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L293'>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="L262" class="LineNr">262 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<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#L225'>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="L264" class="LineNr">264 </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="L265" class="LineNr">265 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L266" class="LineNr">266 </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="L267" class="LineNr">267 </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="L268" class="LineNr">268 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L269" class="LineNr">269 </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="L270" class="LineNr">270 </span>      <a href='003trace.cc.html#L211'>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#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L271" class="LineNr">271 </span>    <span class="Normal">else</span>
-<span id="L272" class="LineNr">272 </span>      <a href='003trace.cc.html#L211'>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#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L273" class="LineNr">273 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L276" class="LineNr">276 </span><span class="Delimiter">}</span>
-<span id="L277" class="LineNr">277 </span>
-<span id="L278" class="LineNr">278 </span>string <a href='031check_operands.cc.html#L278'>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="L279" class="LineNr">279 </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="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><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="L281" class="LineNr">281 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L282" class="LineNr">282 </span><span class="Delimiter">}</span>
-<span id="L283" class="LineNr">283 </span>
-<span id="L284" class="LineNr">284 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L287" class="LineNr">287 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L310'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L288" class="LineNr">288 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L289" class="LineNr">289 </span>  <span class="Delimiter">}</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Identifier">return</span> bitvector<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><span class="Normal">bool</span> <a href='031check_operands.cc.html#L293'>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="L294" class="LineNr">294 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L297'>first_operand</a><span class="Delimiter">(</span>inst<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">int</span> <a href='031check_operands.cc.html#L297'>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="L298" class="LineNr">298 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L301" class="LineNr">301 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L302" class="LineNr">302 </span>    <span class="Normal">else</span>
-<span id="L303" class="LineNr">303 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Delimiter">}</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Identifier">return</span> <span class="Constant">1</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">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L309" class="LineNr">309 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L310" class="LineNr">310 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L310'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L314" class="LineNr">314 </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="L315" class="LineNr">315 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L316" class="LineNr">316 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L317" class="LineNr">317 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L318" class="LineNr">318 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L319" class="LineNr">319 </span>    <span class="Delimiter">}</span>
-<span id="L320" class="LineNr">320 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L321" class="LineNr">321 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Delimiter">}</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L324" class="LineNr">324 </span><span class="Delimiter">}</span>
-<span id="L325" class="LineNr">325 </span>
-<span id="L326" class="LineNr">326 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L327" class="LineNr">327 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L328" class="LineNr">328 </span>== <span class="Constant">0x1</span>
-<span id="L329" class="LineNr">329 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L330" class="LineNr">330 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L331" class="LineNr">331 </span>
-<span id="L332" class="LineNr">332 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L333" class="LineNr">333 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L334" class="LineNr">334 </span>
-<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L336" class="LineNr">336 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L337" class="LineNr">337 </span>== <span class="Constant">0x1</span>
-<span id="L338" class="LineNr">338 </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="L339" class="LineNr">339 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
-<span id="L340" class="LineNr">340 </span>
-<span id="L341" class="LineNr">341 </span><span class="Delimiter">:(code)</span>
-<span id="L342" class="LineNr">342 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L342'>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="L343" class="LineNr">343 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L377'>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="L344" class="LineNr">344 </span>  <a href='031check_operands.cc.html#L389'>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="L345" class="LineNr">345 </span>  <a href='031check_operands.cc.html#L389'>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="L346" class="LineNr">346 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L347" class="LineNr">347 </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="L348" class="LineNr">348 </span>    <a href='031check_operands.cc.html#L389'>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="L349" class="LineNr">349 </span>    <a href='031check_operands.cc.html#L394'>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="L350" class="LineNr">350 </span>  <span class="Delimiter">}</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L352" class="LineNr">352 </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="L353" class="LineNr">353 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L355" class="LineNr">355 </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="L356" class="LineNr">356 </span>    <a href='031check_operands.cc.html#L389'>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="L357" class="LineNr">357 </span>    <a href='031check_operands.cc.html#L389'>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="L358" class="LineNr">358 </span>  <span class="Delimiter">}</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L360" class="LineNr">360 </span>    <a href='031check_operands.cc.html#L394'>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="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L394'>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="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</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="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
-<span id="L367" class="LineNr">367 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
-<span id="L368" class="LineNr">368 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
-<span id="L369" class="LineNr">369 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L369'>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="L370" class="LineNr">370 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L377'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L293'>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="L371" class="LineNr">371 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L372" class="LineNr">372 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>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="L373" class="LineNr">373 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
-<span id="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L376" class="LineNr">376 </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="L377" class="LineNr">377 </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="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L379" class="LineNr">379 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L380" class="LineNr">380 </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="L381" class="LineNr">381 </span>      <a href='003trace.cc.html#L211'>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#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L382" class="LineNr">382 </span>    <span class="Normal">else</span>
-<span id="L383" class="LineNr">383 </span>      <a href='003trace.cc.html#L211'>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#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L384" class="LineNr">384 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L385" class="LineNr">385 </span>  <span class="Delimiter">}</span>
-<span id="L386" class="LineNr">386 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">}</span>
-<span id="L388" class="LineNr">388 </span>
-<span id="L389" class="LineNr">389 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L389'>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="L390" class="LineNr">390 </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="L391" class="LineNr">391 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L392" class="LineNr">392 </span><span class="Delimiter">}</span>
-<span id="L393" class="LineNr">393 </span>
-<span id="L394" class="LineNr">394 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L394'>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="L395" class="LineNr">395 </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="L396" class="LineNr">396 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
-<span id="L398" class="LineNr">398 </span>
-<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L401" class="LineNr">401 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L402" class="LineNr">402 </span>== <span class="Constant">0x1</span>
-<span id="L403" class="LineNr">403 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L404" class="LineNr">404 </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="L405" class="LineNr">405 </span>$error: <span class="Constant">0</span>
-<span id="L406" class="LineNr">406 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L407" class="LineNr">407 </span>
-<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L409" class="LineNr">409 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L410" class="LineNr">410 </span>== <span class="Constant">0x1</span>
-<span id="L411" class="LineNr">411 </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="L412" class="LineNr">412 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L413" class="LineNr">413 </span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L415" class="LineNr">415 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L416" class="LineNr">416 </span>== <span class="Constant">0x1</span>
-<span id="L417" class="LineNr">417 </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="L418" class="LineNr">418 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L419" class="LineNr">419 </span>
-<span id="L420" class="LineNr">420 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L421" class="LineNr">421 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L422" class="LineNr">422 </span>== <span class="Constant">0x1</span>
-<span id="L423" class="LineNr">423 </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="L424" class="LineNr">424 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
-<span id="L425" class="LineNr">425 </span>
-<span id="L426" class="LineNr">426 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L427" class="LineNr">427 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L428" class="LineNr">428 </span>== <span class="Constant">0x1</span>
-<span id="L429" class="LineNr">429 </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="L430" class="LineNr">430 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
-<span id="L431" class="LineNr">431 </span>
-<span id="L432" class="LineNr">432 </span><span class="Delimiter">:(scenario check_missing_base_operand)</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">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="L436" class="LineNr">436 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
-<span id="L437" class="LineNr">437 </span>
-<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L439" class="LineNr">439 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L440" class="LineNr">440 </span>== <span class="Constant">0x1</span>
-<span id="L441" class="LineNr">441 </span><span class="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="L442" class="LineNr">442 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
-<span id="L443" class="LineNr">443 </span>
-<span id="L444" class="LineNr">444 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L445" class="LineNr">445 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L446" class="LineNr">446 </span>== <span class="Constant">0x1</span>
-<span id="L447" class="LineNr">447 </span><span class="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="L448" class="LineNr">448 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
-<span id="L449" class="LineNr">449 </span>
-<span id="L450" class="LineNr">450 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L451" class="LineNr">451 </span>== <span class="Constant">0x1</span>
-<span id="L452" class="LineNr">452 </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="L453" class="LineNr">453 </span>$error: <span class="Constant">0</span>
-<span id="L454" class="LineNr">454 </span>
-<span id="L455" class="LineNr">455 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
-<span id="L456" class="LineNr">456 </span>
-<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(code)</span>
-<span id="L458" class="LineNr">458 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L459" class="LineNr">459 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L460" class="LineNr">460 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L461" class="LineNr">461 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L462" class="LineNr">462 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L463" class="LineNr">463 </span>  <span class="Delimiter">}</span>
-<span id="L464" class="LineNr">464 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L465" class="LineNr">465 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L466" class="LineNr">466 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L467" class="LineNr">467 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Delimiter">}</span>
-<span id="L469" class="LineNr">469 </span>  <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L470" class="LineNr">470 </span><span class="Delimiter">}</span>
-<span id="L471" class="LineNr">471 </span>
-<span id="L472" class="LineNr">472 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L472'>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="L473" class="LineNr">473 </span>  <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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="Delimiter">:(scenario check_missing_disp16_operand)</span>
-<span id="L477" class="LineNr">477 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L478" class="LineNr">478 </span>== <span class="Constant">0x1</span>
-<span id="L479" class="LineNr">479 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L480" class="LineNr">480 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L481" class="LineNr">481 </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="L482" class="LineNr">482 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L483" class="LineNr">483 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
-<span id="L484" class="LineNr">484 </span>
-<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L486" class="LineNr">486 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">;</span>
-<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L488" class="LineNr">488 </span><span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L489" class="LineNr">489 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L490" class="LineNr">490 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L491" class="LineNr">491 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L492" class="LineNr">492 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L493" class="LineNr">493 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L494" class="LineNr">494 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L495" class="LineNr">495 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L496" class="LineNr">496 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L497" class="LineNr">497 </span>
-<span id="L498" class="LineNr">498 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L499" class="LineNr">499 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L500" class="LineNr">500 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L501" class="LineNr">501 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L502" class="LineNr">502 </span>
-<span id="L503" class="LineNr">503 </span><span class="Delimiter">:(code)</span>
-<span id="L504" class="LineNr">504 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L504'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L505" class="LineNr">505 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L486'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L506" class="LineNr">506 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">))</span>
-<span id="L507" class="LineNr">507 </span>    <a href='031check_operands.cc.html#L342'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L508" class="LineNr">508 </span>  <a href='031check_operands.cc.html#L511'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L509" class="LineNr">509 </span><span class="Delimiter">}</span>
-<span id="L510" class="LineNr">510 </span>
-<span id="L511" class="LineNr">511 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L511'>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="L512" class="LineNr">512 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L377'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L293'>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="L513" class="LineNr">513 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L284'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L514" class="LineNr">514 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>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="L515" class="LineNr">515 </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="L516" class="LineNr">516 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L69'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L517" class="LineNr">517 </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="L518" class="LineNr">518 </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="L519" class="LineNr">519 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L520" class="LineNr">520 </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="L521" class="LineNr">521 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L522" class="LineNr">522 </span>    <span class="Normal">else</span>
-<span id="L523" class="LineNr">523 </span>      <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;' (&quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L337'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L524" class="LineNr">524 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L525" class="LineNr">525 </span>  <span class="Delimiter">}</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='031check_operands.cc.html#L529'>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="L530" class="LineNr">530 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L531" class="LineNr">531 </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="L532" class="LineNr">532 </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#L529'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L533" class="LineNr">533 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L253" class="LineNr">253 </span><span class="Delimiter">}</span>
+<span id="L254" class="LineNr">254 </span>
+<span id="L255" class="LineNr">255 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L256" class="LineNr">256 </span>
+<span id="L257" class="LineNr">257 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L257'>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="L258" class="LineNr">258 </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#L292'>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="L259" class="LineNr">259 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L261" class="LineNr">261 </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="L262" class="LineNr">262 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L263" class="LineNr">263 </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="L264" class="LineNr">264 </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="L265" class="LineNr">265 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L267" class="LineNr">267 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L268" class="LineNr">268 </span>    <span class="Normal">else</span>
+<span id="L269" class="LineNr">269 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L270" class="LineNr">270 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L271" class="LineNr">271 </span>  <span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='031check_operands.cc.html#L275'>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="L276" class="LineNr">276 </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="L277" class="LineNr">277 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><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="L278" class="LineNr">278 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><a href='010---vm.cc.html#L368'>Name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L280" class="LineNr">280 </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="L281" class="LineNr">281 </span><span class="Delimiter">}</span>
+<span id="L282" class="LineNr">282 </span>
+<span id="L283" class="LineNr">283 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L286" class="LineNr">286 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L309'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L287" class="LineNr">287 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Delimiter">}</span>
+<span id="L289" class="LineNr">289 </span>  <span class="Identifier">return</span> bitvector<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">bool</span> <a href='031check_operands.cc.html#L292'>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="L293" class="LineNr">293 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L296'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L294" class="LineNr">294 </span><span class="Delimiter">}</span>
+<span id="L295" class="LineNr">295 </span>
+<span id="L296" class="LineNr">296 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L296'>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="L297" class="LineNr">297 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L299" class="LineNr">299 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L300" class="LineNr">300 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>    <span class="Normal">else</span>
+<span id="L302" class="LineNr">302 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Delimiter">}</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Identifier">return</span> <span class="Constant">1</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="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
+<span id="L308" class="LineNr">308 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L309" class="LineNr">309 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L309'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </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="L314" class="LineNr">314 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L315" class="LineNr">315 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L317" class="LineNr">317 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L318" class="LineNr">318 </span>    <span class="Delimiter">}</span>
+<span id="L319" class="LineNr">319 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L320" class="LineNr">320 </span>    found =<span class="Constant"> true</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> bv<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="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L326" class="LineNr">326 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L327" class="LineNr">327 </span>== <span class="Constant">0x1</span>
+<span id="L328" class="LineNr">328 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L329" class="LineNr">329 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L330" class="LineNr">330 </span>
+<span id="L331" class="LineNr">331 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L332" class="LineNr">332 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L333" class="LineNr">333 </span>
+<span id="L334" class="LineNr">334 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L335" class="LineNr">335 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L336" class="LineNr">336 </span>== <span class="Constant">0x1</span>
+<span id="L337" class="LineNr">337 </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="L338" class="LineNr">338 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
+<span id="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='031check_operands.cc.html#L341'>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="L342" class="LineNr">342 </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="L343" class="LineNr">343 </span>  <a href='031check_operands.cc.html#L388'>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="L344" class="LineNr">344 </span>  <a href='031check_operands.cc.html#L388'>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="L345" class="LineNr">345 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L346" class="LineNr">346 </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="L347" class="LineNr">347 </span>    <a href='031check_operands.cc.html#L388'>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="L348" class="LineNr">348 </span>    <a href='031check_operands.cc.html#L393'>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="L349" class="LineNr">349 </span>  <span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L351" class="LineNr">351 </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="L352" class="LineNr">352 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L353" class="LineNr">353 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L354" class="LineNr">354 </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="L355" class="LineNr">355 </span>    <a href='031check_operands.cc.html#L388'>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="L356" class="LineNr">356 </span>    <a href='031check_operands.cc.html#L388'>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="L357" class="LineNr">357 </span>  <span class="Delimiter">}</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L359" class="LineNr">359 </span>    <a href='031check_operands.cc.html#L393'>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="L360" class="LineNr">360 </span>    <a href='031check_operands.cc.html#L393'>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="L361" class="LineNr">361 </span>  <span class="Delimiter">}</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</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">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L366" class="LineNr">366 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
+<span id="L367" class="LineNr">367 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
+<span id="L368" class="LineNr">368 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L368'>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="L369" class="LineNr">369 </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#L292'>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="L370" class="LineNr">370 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L371" class="LineNr">371 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L372" class="LineNr">372 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
+<span id="L373" class="LineNr">373 </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="L374" class="LineNr">374 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L375" class="LineNr">375 </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="L376" class="LineNr">376 </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="L377" class="LineNr">377 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L61'>DISP8</a> || i == <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L378" class="LineNr">378 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L379" class="LineNr">379 </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="L380" class="LineNr">380 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L381" class="LineNr">381 </span>    <span class="Normal">else</span>
+<span id="L382" class="LineNr">382 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L383" class="LineNr">383 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L384" class="LineNr">384 </span>  <span class="Delimiter">}</span>
+<span id="L385" class="LineNr">385 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">}</span>
+<span id="L387" class="LineNr">387 </span>
+<span id="L388" class="LineNr">388 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L388'>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="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> type<span class="Delimiter">))</span>
+<span id="L390" class="LineNr">390 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L275'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L391" class="LineNr">391 </span><span class="Delimiter">}</span>
+<span id="L392" class="LineNr">392 </span>
+<span id="L393" class="LineNr">393 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L393'>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="L394" class="LineNr">394 </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="L395" class="LineNr">395 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L275'>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;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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">:(scenarios transform)</span>
+<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L400" class="LineNr">400 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L401" class="LineNr">401 </span>== <span class="Constant">0x1</span>
+<span id="L402" class="LineNr">402 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L403" class="LineNr">403 </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="L404" class="LineNr">404 </span>$error: <span class="Constant">0</span>
+<span id="L405" class="LineNr">405 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L406" class="LineNr">406 </span>
+<span id="L407" class="LineNr">407 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L408" class="LineNr">408 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L409" class="LineNr">409 </span>== <span class="Constant">0x1</span>
+<span id="L410" class="LineNr">410 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
+<span id="L411" class="LineNr">411 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L412" class="LineNr">412 </span>
+<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L414" class="LineNr">414 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L415" class="LineNr">415 </span>== <span class="Constant">0x1</span>
+<span id="L416" class="LineNr">416 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
+<span id="L417" class="LineNr">417 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L420" class="LineNr">420 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L421" class="LineNr">421 </span>== <span class="Constant">0x1</span>
+<span id="L422" class="LineNr">422 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
+<span id="L423" class="LineNr">423 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L426" class="LineNr">426 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L427" class="LineNr">427 </span>== <span class="Constant">0x1</span>
+<span id="L428" class="LineNr">428 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L432" class="LineNr">432 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L433" class="LineNr">433 </span>== <span class="Constant">0x1</span>
+<span id="L434" class="LineNr">434 </span><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="L435" class="LineNr">435 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
+<span id="L436" class="LineNr">436 </span>
+<span id="L437" class="LineNr">437 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L438" class="LineNr">438 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L439" class="LineNr">439 </span>== <span class="Constant">0x1</span>
+<span id="L440" class="LineNr">440 </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="L441" class="LineNr">441 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
+<span id="L442" class="LineNr">442 </span>
+<span id="L443" class="LineNr">443 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L444" class="LineNr">444 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L445" class="LineNr">445 </span>== <span class="Constant">0x1</span>
+<span id="L446" class="LineNr">446 </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="L447" class="LineNr">447 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
+<span id="L448" class="LineNr">448 </span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L450" class="LineNr">450 </span>== <span class="Constant">0x1</span>
+<span id="L451" class="LineNr">451 </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="L452" class="LineNr">452 </span>$error: <span class="Constant">0</span>
+<span id="L453" class="LineNr">453 </span>
+<span id="L454" class="LineNr">454 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L455" class="LineNr">455 </span>
+<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(code)</span>
+<span id="L457" class="LineNr">457 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L503'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L458" class="LineNr">458 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L459" class="LineNr">459 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L460" class="LineNr">460 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L461" class="LineNr">461 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L462" class="LineNr">462 </span>  <span class="Delimiter">}</span>
+<span id="L463" class="LineNr">463 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L464" class="LineNr">464 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L465" class="LineNr">465 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L466" class="LineNr">466 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L467" class="LineNr">467 </span>  <span class="Delimiter">}</span>
+<span id="L468" class="LineNr">468 </span>  <a href='031check_operands.cc.html#L503'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<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="Normal">void</span> <a href='031check_operands.cc.html#L471'>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="L472" class="LineNr">472 </span>  <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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">:(scenario check_missing_disp16_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="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L479" class="LineNr">479 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L480" class="LineNr">480 </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="L481" class="LineNr">481 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L482" class="LineNr">482 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if equal, if ZF is set): missing disp16 operand</span>
+<span id="L483" class="LineNr">483 </span>
+<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L485" class="LineNr">485 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">;</span>
+<span id="L486" class="LineNr">486 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L487" class="LineNr">487 </span><span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L488" class="LineNr">488 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L489" class="LineNr">489 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L490" class="LineNr">490 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L491" class="LineNr">491 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L492" class="LineNr">492 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L493" class="LineNr">493 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L494" class="LineNr">494 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L495" class="LineNr">495 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L496" class="LineNr">496 </span>
+<span id="L497" class="LineNr">497 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L498" class="LineNr">498 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L499" class="LineNr">499 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L500" class="LineNr">500 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L501" class="LineNr">501 </span>
+<span id="L502" class="LineNr">502 </span><span class="Delimiter">:(code)</span>
+<span id="L503" class="LineNr">503 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L503'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L504" class="LineNr">504 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L485'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L505" class="LineNr">505 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span>
+<span id="L506" class="LineNr">506 </span>    <a href='031check_operands.cc.html#L341'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L507" class="LineNr">507 </span>  <a href='031check_operands.cc.html#L510'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L508" class="LineNr">508 </span><span class="Delimiter">}</span>
+<span id="L509" class="LineNr">509 </span>
+<span id="L510" class="LineNr">510 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L510'>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="L511" class="LineNr">511 </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#L292'>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="L512" class="LineNr">512 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L513" class="LineNr">513 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L514" class="LineNr">514 </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="L515" class="LineNr">515 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L516" class="LineNr">516 </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="L517" class="LineNr">517 </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="L518" class="LineNr">518 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L519" class="LineNr">519 </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="L520" class="LineNr">520 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L528'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L521" class="LineNr">521 </span>    <span class="Normal">else</span>
+<span id="L522" class="LineNr">522 </span>      <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L528'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L523" class="LineNr">523 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L524" class="LineNr">524 </span>  <span class="Delimiter">}</span>
+<span id="L525" class="LineNr">525 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L526" class="LineNr">526 </span><span class="Delimiter">}</span>
+<span id="L527" class="LineNr">527 </span>
+<span id="L528" class="LineNr">528 </span>string <a href='031check_operands.cc.html#L528'>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="L529" class="LineNr">529 </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="L530" class="LineNr">530 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><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="L531" class="LineNr">531 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L532" class="LineNr">532 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L533" class="LineNr">533 </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="L534" class="LineNr">534 </span><span class="Delimiter">}</span>
 <span id="L535" class="LineNr">535 </span>
-<span id="L536" class="LineNr">536 </span><span class="Comment">#undef HAS</span>
-<span id="L537" class="LineNr">537 </span><span class="Comment">#undef SET</span>
-<span id="L538" class="LineNr">538 </span><span class="Comment">#undef CLEAR</span>
-<span id="L539" class="LineNr">539 </span>
-<span id="L540" class="LineNr">540 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L541" class="LineNr">541 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L536" class="LineNr">536 </span>string <a href='031check_operands.cc.html#L536'>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="L537" class="LineNr">537 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L538" class="LineNr">538 </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="L539" class="LineNr">539 </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#L536'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L540" class="LineNr">540 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L541" class="LineNr">541 </span><span class="Delimiter">}</span>
+<span id="L542" class="LineNr">542 </span>
+<span id="L543" class="LineNr">543 </span><span class="Comment">#undef HAS</span>
+<span id="L544" class="LineNr">544 </span><span class="Comment">#undef SET</span>
+<span id="L545" class="LineNr">545 </span><span class="Comment">#undef CLEAR</span>
+<span id="L546" class="LineNr">546 </span>
+<span id="L547" class="LineNr">547 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L548" class="LineNr">548 </span><span class="Comment">#include&lt;cctype&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html
index 757446f3..9648b995 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -72,30 +72,30 @@ if ('onhashchange' in window) {
 <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; <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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="L12" class="LineNr">12 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L243'>put</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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="L22" class="LineNr">22 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><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#L14'>code</a><span class="Delimiter">);</span>
-<span id="L27" class="LineNr">27 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</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#L224'>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#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L297'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L296'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
-<span id="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>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="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
 <span id="L37" class="LineNr">37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr">38 </span>
@@ -106,12 +106,12 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr">43 </span>    <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L362'>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#L211'>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="L46" class="LineNr">46 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' 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#L211'>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="L51" class="LineNr">51 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' 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>
diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html
index e8820050..c180ef12 100644
--- a/html/subx/034compute_segment_address.cc.html
+++ b/html/subx/034compute_segment_address.cc.html
@@ -64,14 +64,14 @@ if ('onhashchange' in window) {
 <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#L14'>code</a>
-<span id="L7" class="LineNr">  7 </span><span class="PreProc">0</span><span class="Constant">5</span>/add <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
+<span id="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: 0x08048054 -&gt; 05</span>
-<span id="L10" class="LineNr"> 10 </span><span class="traceContains">+load: 0x08048055 -&gt; 0a</span>
-<span id="L11" class="LineNr"> 11 </span><span class="traceContains">+load: 0x08048056 -&gt; 0b</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+load: 0x08048057 -&gt; 0c</span>
-<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+load: 0x08048058 -&gt; 0d</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 imm32 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>
@@ -82,7 +82,7 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </span><span class="Comment">//: the new data to existing data for the segment.</span>
 <span id="L22" class="LineNr"> 22 </span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L24" class="LineNr"> 24 </span>map&lt;<span class="Comment">/*</span><span class="Comment"><a href='010---vm.cc.html#L336'>name</a></span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Normal">int</span>&gt; <a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">;</span>
+<span id="L24" class="LineNr"> 24 </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; <a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Normal">bool</span> <a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// global to permit cross-layer communication</span>
 <span id="L26" class="LineNr"> 26 </span><span class="Normal">int</span> <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> = -<span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// global to permit cross-layer communication</span>
 <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
@@ -94,7 +94,7 @@ if ('onhashchange' in window) {
 <span id="L33" class="LineNr"> 33 </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="L34" class="LineNr"> 34 </span>  <a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;new segment '&quot;</span> &lt;&lt; segment_title &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L36" class="LineNr"> 36 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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="L37" class="LineNr"> 37 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>segment_title == <span class="Constant">&quot;code&quot;</span><span class="Delimiter">)</span>
 <span id="L38" class="LineNr"> 38 </span>      <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>segment_title == <span class="Constant">&quot;data&quot;</span><span class="Delimiter">)</span>
@@ -104,7 +104,7 @@ if ('onhashchange' in window) {
 <span id="L43" class="LineNr"> 43 </span>    out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>segment<span class="Delimiter">());</span>
 <span id="L44" class="LineNr"> 44 </span>  <span class="Delimiter">}</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L204'>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;prepending 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="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;prepending 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="L47" class="LineNr"> 47 </span>  <span class="Delimiter">}</span>
 <span id="L48" class="LineNr"> 48 </span>  <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> = get<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">);</span>
 <span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span>
@@ -112,10 +112,10 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(before &quot;End flush(p, lines) Special-cases&quot;)</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">&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='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr"> 57 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;flushing to segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L58" class="LineNr"> 58 </span>  vector&lt;line&gt;&amp; curr_segment_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span>
 <span id="L59" class="LineNr"> 59 </span>  curr_segment_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr_segment_data<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
 <span id="L60" class="LineNr"> 60 </span>  <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
@@ -125,22 +125,22 @@ if ('onhashchange' in window) {
 <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="Delimiter">:(scenario repeated_segment_merges_data)</span>
-<span id="L67" class="LineNr"> 67 </span>== <a href='031check_operands.cc.html#L14'>code</a>
-<span id="L68" class="LineNr"> 68 </span><span class="PreProc">0</span><span class="Constant">5</span>/add <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
-<span id="L69" class="LineNr"> 69 </span>== <a href='031check_operands.cc.html#L14'>code</a>
-<span id="L70" class="LineNr"> 70 </span>2d/subtract <span class="Constant">0xddccbbaa</span>/imm32  <span class="Comment"># subtract 0xddccbbaa from EAX</span>
+<span id="L67" class="LineNr"> 67 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L68" class="LineNr"> 68 </span><span class="PreProc">0</span><span class="Constant">5</span>/add-to-EAX  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L69" class="LineNr"> 69 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L70" class="LineNr"> 70 </span>2d/subtract-from-EAX  <span class="Constant">0xddccbbaa</span>/imm32
 <span id="L71" class="LineNr"> 71 </span><span class="traceContains">+parse: new segment 'code'</span>
 <span id="L72" class="LineNr"> 72 </span><span class="traceContains">+parse: prepending to segment 'code'</span>
-<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+load: 0x08048054 -&gt; 2d</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+load: 0x08048055 -&gt; aa</span>
-<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+load: 0x08048056 -&gt; bb</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+load: 0x08048057 -&gt; cc</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+load: 0x08048058 -&gt; dd</span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+load: 0x08048059 -&gt; 05</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+load: 0x0804805a -&gt; 0a</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+load: 0x0804805b -&gt; 0b</span>
-<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+load: 0x0804805c -&gt; 0c</span>
-<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+load: 0x0804805d -&gt; 0d</span>
+<span id="L73" class="LineNr"> 73 </span><span class="traceContains">+load: 0x09000054 -&gt; 2d</span>
+<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+load: 0x09000055 -&gt; aa</span>
+<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+load: 0x09000056 -&gt; bb</span>
+<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+load: 0x09000057 -&gt; cc</span>
+<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+load: 0x09000058 -&gt; dd</span>
+<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+load: 0x09000059 -&gt; 05</span>
+<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+load: 0x0900005a -&gt; 0a</span>
+<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+load: 0x0900005b -&gt; 0b</span>
+<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+load: 0x0900005c -&gt; 0c</span>
+<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+load: 0x0900005d -&gt; 0d</span>
 <span id="L83" class="LineNr"> 83 </span>
 <span id="L84" class="LineNr"> 84 </span><span class="Comment">//: compute segment address</span>
 <span id="L85" class="LineNr"> 85 </span>
@@ -149,16 +149,16 @@ if ('onhashchange' in window) {
 <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='034compute_segment_address.cc.html#L90'>compute_segment_starts</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute segment addresses&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- compute segment addresses&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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="L93" class="LineNr"> 93 </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#L100'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L94" class="LineNr"> 94 </span>    segment&amp; curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L95" class="LineNr"> 95 </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="L96" class="LineNr"> 96 </span>      curr<span class="Delimiter">.</span>start = <a href='012elf.cc.html#L136'>CODE_START</a> + i*SEGMENT_SIZE + p_offset<span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>      <a href='003trace.cc.html#L204'>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#L368'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span>      curr<span class="Delimiter">.</span>start = <a href='012elf.cc.html#L135'>CODE_SEGMENT</a> + i*SPACE_FOR_SEGMENT + p_offset<span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>      <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L403'>HEXWORD</a> &lt;&lt; curr<span class="Delimiter">.</span>start &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Delimiter">}</span>
 <span id="L99" class="LineNr"> 99 </span>    p_offset += <a href='034compute_segment_address.cc.html#L104'>size_of</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='012elf.cc.html#L135'>SEGMENT_SIZE</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
+<span id="L100" class="LineNr">100 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span><span class="Delimiter">}</span>
 <span id="L103" class="LineNr">103 </span>
diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html
index 8774406e..835ecc2b 100644
--- a/html/subx/035labels.cc.html
+++ b/html/subx/035labels.cc.html
@@ -88,7 +88,7 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(scenario pack_immediate_ignores_single_byte_nondigit_operand)</span>
 <span id="L27" class="LineNr"> 27 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L28" class="LineNr"> 28 </span>== <span class="Constant">0x1</span>
-<span id="L29" class="LineNr"> 29 </span>b9/copy a/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L29" class="LineNr"> 29 </span>b9/copy  a/imm32
 <span id="L30" class="LineNr"> 30 </span><span class="traceContains">+transform: packing instruction 'b9/copy a/imm32'</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
 <span id="L32" class="LineNr"> 32 </span><span class="traceContains">+transform: instruction after packing: 'b9 a'</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(scenario pack_immediate_ignores_3_hex_digit_operand)</span>
 <span id="L35" class="LineNr"> 35 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L36" class="LineNr"> 36 </span>== <span class="Constant">0x1</span>
-<span id="L37" class="LineNr"> 37 </span>b9/copy aaa/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L37" class="LineNr"> 37 </span>b9/copy  aaa/imm32
 <span id="L38" class="LineNr"> 38 </span><span class="traceContains">+transform: packing instruction 'b9/copy aaa/imm32'</span>
 <span id="L39" class="LineNr"> 39 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
 <span id="L40" class="LineNr"> 40 </span><span class="traceContains">+transform: instruction after packing: 'b9 aaa'</span>
@@ -104,7 +104,7 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(scenario pack_immediate_ignores_non_hex_operand)</span>
 <span id="L43" class="LineNr"> 43 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L44" class="LineNr"> 44 </span>== <span class="Constant">0x1</span>
-<span id="L45" class="LineNr"> 45 </span>b9/copy xxx/imm32  <span class="Comment"># copy to ECX</span>
+<span id="L45" class="LineNr"> 45 </span>b9/copy xxx/imm32
 <span id="L46" class="LineNr"> 46 </span><span class="traceContains">+transform: packing instruction 'b9/copy xxx/imm32'</span>
 <span id="L47" class="LineNr"> 47 </span><span class="Comment"># no change (we're just not printing metadata to the trace)</span>
 <span id="L48" class="LineNr"> 48 </span><span class="traceContains">+transform: instruction after packing: 'b9 xxx'</span>
@@ -113,229 +113,223 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(code)</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='035labels.cc.html#L52'>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="L53" class="LineNr"> 53 </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="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;empty name!</span><span class="cSpecial">\n</span><span class="Constant">&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>  <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="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L336'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L58" class="LineNr"> 58 </span>    <a href='003trace.cc.html#L210'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L59" class="LineNr"> 59 </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="L60" class="LineNr"> 60 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' looks like a hex number; use a different <a href='010---vm.cc.html#L336'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L60" class="LineNr"> 60 </span>    <a href='003trace.cc.html#L210'>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</span><span class="cSpecial">\n</span><span class="Constant">&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>  <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="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with a digit, and so can be confused with a negative number; use a different name.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L64" class="LineNr"> 64 </span>    <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' starts with a digit, and so can be confused with a negative number; use a different name.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L65" class="LineNr"> 65 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; s &lt;&lt; <span class="Constant">&quot;' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L336'>name</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L66" class="LineNr"> 66 </span>    <a href='003trace.cc.html#L210'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<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="Comment">//: Now that that's done, let's start using names as labels.</span>
 <span id="L70" class="LineNr"> 70 </span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario map_label)</span>
 <span id="L72" class="LineNr"> 72 </span>== <span class="Constant">0x1</span>
-<span id="L73" class="LineNr"> 73 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L74" class="LineNr"> 74 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L75" class="LineNr"> 75 </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="L76" class="LineNr"> 76 </span><span class="Normal">loop</span>:
-<span id="L77" class="LineNr"> 77 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
-<span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
-<span id="L81" class="LineNr"> 81 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L83'>rewrite_labels</a><span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(code)</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Normal">void</span> <a href='035labels.cc.html#L83'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L84" class="LineNr"> 84 </span>  <a href='003trace.cc.html#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L86" class="LineNr"> 86 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L87" class="LineNr"> 87 </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="L88" class="LineNr"> 88 </span>  <a href='035labels.cc.html#L95'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L90" class="LineNr"> 90 </span>  <a href='035labels.cc.html#L142'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L92" class="LineNr"> 92 </span>  <a href='035labels.cc.html#L154'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
-<span id="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="Normal">void</span> <a href='035labels.cc.html#L95'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
-<span id="L102" class="LineNr">102 </span>      <span class="Comment">// deduce its size</span>
-<span id="L103" class="LineNr">103 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
-<span id="L104" class="LineNr">104 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
-<span id="L105" class="LineNr">105 </span>      <span class="Comment">// have to deal with bitfields.</span>
-<span id="L106" class="LineNr">106 </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="L107" class="LineNr">107 </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="L108" class="LineNr">108 </span>          <a href='003trace.cc.html#L211'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L109" class="LineNr">109 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>      <span class="Delimiter">}</span>
-<span id="L111" class="LineNr">111 </span>      <span class="Comment">// automatically handle /disp8 and /imm8 here</span>
-<span id="L112" class="LineNr">112 </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="L113" class="LineNr">113 </span>        ++current_byte<span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span>      <span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>        string label = <a href='035labels.cc.html#L198'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L117" class="LineNr">117 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
-<span id="L118" class="LineNr">118 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L120" class="LineNr">120 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L394'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L121" class="LineNr">121 </span>          <a href='003trace.cc.html#L211'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L122" class="LineNr">122 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L123" class="LineNr">123 </span>          <a href='003trace.cc.html#L211'>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#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L124" class="LineNr">124 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L135'>Dump_map</a><span class="Delimiter">)</span>
-<span id="L125" class="LineNr">125 </span>          cerr &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L368'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>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="L126" class="LineNr">126 </span>        <a href='001help.cc.html#L243'>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="L127" class="LineNr">127 </span>        <a href='003trace.cc.html#L204'>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="L128" class="LineNr">128 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</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 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">:(before &quot;End Globals&quot;)</span>
-<span id="L135" class="LineNr">135 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L135'>Dump_map</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
-<span id="L137" class="LineNr">137 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>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="L138" class="LineNr">138 </span>  <a href='035labels.cc.html#L135'>Dump_map</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span><span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span>
-<span id="L141" class="LineNr">141 </span><span class="Delimiter">:(code)</span>
-<span id="L142" class="LineNr">142 </span><span class="Normal">void</span> <a href='035labels.cc.html#L142'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L150'>is_label</a><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Delimiter">}</span>
-<span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span>
-<span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L150'>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="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Normal">void</span> <a href='035labels.cc.html#L154'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L157" class="LineNr">157 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L159" class="LineNr">159 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L161" class="LineNr">161 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L162" class="LineNr">162 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L163" class="LineNr">163 </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="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;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L165" class="LineNr">165 </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="L166" class="LineNr">166 </span>            <a href='003trace.cc.html#L211'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L167" class="LineNr">167 </span>          <span class="Normal">else</span>
-<span id="L168" class="LineNr">168 </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="L169" class="LineNr">169 </span>        <span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </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="L171" class="LineNr">171 </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="L172" class="LineNr">172 </span>            <a href='003trace.cc.html#L211'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Normal">loop</span>:
+<span id="L74" class="LineNr"> 74 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L75" class="LineNr"> 75 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
+<span id="L76" class="LineNr"> 76 </span>
+<span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
+<span id="L78" class="LineNr"> 78 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L80'>rewrite_labels</a><span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(code)</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='035labels.cc.html#L80'>rewrite_labels</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite labels&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </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="L85" class="LineNr"> 85 </span>  <a href='035labels.cc.html#L92'>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="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='035labels.cc.html#L148'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L89" class="LineNr"> 89 </span>  <a href='035labels.cc.html#L160'>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="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
+<span id="L91" class="LineNr"> 91 </span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> <a href='035labels.cc.html#L92'>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="L93" class="LineNr"> 93 </span>  <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L97" class="LineNr"> 97 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L98" class="LineNr"> 98 </span>      <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span>
+<span id="L99" class="LineNr"> 99 </span>      <span class="Comment">// deduce its size</span>
+<span id="L100" class="LineNr">100 </span>      <span class="Comment">// Maybe we should just move this transform to before instruction</span>
+<span id="L101" class="LineNr">101 </span>      <span class="Comment">// packing, and deduce the size of *all* operands. But then we'll also</span>
+<span id="L102" class="LineNr">102 </span>      <span class="Comment">// have to deal with bitfields.</span>
+<span id="L103" class="LineNr">103 </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="L104" class="LineNr">104 </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="L105" class="LineNr">105 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>        current_byte += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L107" class="LineNr">107 </span>      <span class="Delimiter">}</span>
+<span id="L108" class="LineNr">108 </span>      <span class="Comment">// automatically handle /disp8 and /imm8 here</span>
+<span id="L109" class="LineNr">109 </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="L110" class="LineNr">110 </span>        ++current_byte<span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Delimiter">}</span>
+<span id="L112" class="LineNr">112 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span>        string label = <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
+<span id="L115" class="LineNr">115 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </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="L118" class="LineNr">118 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L120" class="LineNr">120 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
+<span id="L122" class="LineNr">122 </span>          <a href='035labels.cc.html#L133'>Map_file</a> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="L123" class="LineNr">123 </span>        <a href='001help.cc.html#L243'>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="L124" class="LineNr">124 </span>        <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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="L125" class="LineNr">125 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</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 class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span><span class="Delimiter">}</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L132" class="LineNr">132 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L132'>Dump_map</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
+<span id="L133" class="LineNr">133 </span>ofstream <a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
+<span id="L135" class="LineNr">135 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>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="L136" class="LineNr">136 </span>  <a href='035labels.cc.html#L132'>Dump_map</a> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Comment">// End --map Settings</span>
+<span id="L138" class="LineNr">138 </span><span class="Delimiter">}</span>
+<span id="L139" class="LineNr">139 </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="L140" class="LineNr">140 </span><span class="Delimiter">:(after &quot;Begin subx translate&quot;)</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L132'>Dump_map</a><span class="Delimiter">)</span>
+<span id="L142" class="LineNr">142 </span>  <a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End subx translate&quot;)</span>
+<span id="L144" class="LineNr">144 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L132'>Dump_map</a><span class="Delimiter">)</span>
+<span id="L145" class="LineNr">145 </span>  <a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>close<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='035labels.cc.html#L148'>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="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L150" class="LineNr">150 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L156'>is_label</a><span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L153" class="LineNr">153 </span>  <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="Normal">bool</span> <a href='035labels.cc.html#L156'>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="L157" class="LineNr">157 </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="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='035labels.cc.html#L160'>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="L161" class="LineNr">161 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L163" class="LineNr">163 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L164" class="LineNr">164 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L165" class="LineNr">165 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L166" class="LineNr">166 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L168" class="LineNr">168 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L169" class="LineNr">169 </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="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;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L171" class="LineNr">171 </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="L172" class="LineNr">172 </span>            <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': 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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L173" class="LineNr">173 </span>          <span class="Normal">else</span>
-<span id="L174" class="LineNr">174 </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="L174" class="LineNr">174 </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="L175" class="LineNr">175 </span>        <span class="Delimiter">}</span>
-<span id="L176" class="LineNr">176 </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="L177" class="LineNr">177 </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="L178" class="LineNr">178 </span>        <span class="Delimiter">}</span>
-<span id="L179" class="LineNr">179 </span>      <span class="Delimiter">}</span>
-<span id="L180" class="LineNr">180 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L181" class="LineNr">181 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<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>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L185" class="LineNr">185 </span>    <a href='003trace.cc.html#L204'>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#L231'>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="L186" class="LineNr">186 </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>string <a href='035labels.cc.html#L189'>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="L190" class="LineNr">190 </span>  ostringstream out<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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L192" class="LineNr">192 </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="L193" class="LineNr">193 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Delimiter">}</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<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>string <a href='035labels.cc.html#L198'>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="L199" class="LineNr">199 </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="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="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
-<span id="L203" class="LineNr">203 </span><span class="Comment">//: instructions.</span>
-<span id="L204" class="LineNr">204 </span><span class="Comment">//: They should also be the only word on a line.</span>
-<span id="L205" class="LineNr">205 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
-<span id="L206" class="LineNr">206 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L176" class="LineNr">176 </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="L177" class="LineNr">177 </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="L178" class="LineNr">178 </span>            <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': 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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L179" class="LineNr">179 </span>          <span class="Normal">else</span>
+<span id="L180" class="LineNr">180 </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="L181" class="LineNr">181 </span>        <span class="Delimiter">}</span>
+<span id="L182" class="LineNr">182 </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="L183" class="LineNr">183 </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="L184" class="LineNr">184 </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="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L187" class="LineNr">187 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L188" class="LineNr">188 </span>      <span class="Delimiter">}</span>
+<span id="L189" class="LineNr">189 </span>    <span class="Delimiter">}</span>
+<span id="L190" class="LineNr">190 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L191" class="LineNr">191 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>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="L192" class="LineNr">192 </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>string <a href='035labels.cc.html#L195'>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="L196" class="LineNr">196 </span>  ostringstream out<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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L198" class="LineNr">198 </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="L199" class="LineNr">199 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L200" class="LineNr">200 </span>  <span class="Delimiter">}</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<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>string <a href='035labels.cc.html#L204'>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="L205" class="LineNr">205 </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="L206" class="LineNr">206 </span><span class="Delimiter">}</span>
 <span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
-<span id="L209" class="LineNr">209 </span>== <span class="Constant">0x1</span>
-<span id="L210" class="LineNr">210 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L211" class="LineNr">211 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L212" class="LineNr">212 </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="L213" class="LineNr">213 </span><span class="Comment"># address 1</span>
-<span id="L214" class="LineNr">214 </span><span class="Normal">loop</span>:
-<span id="L215" class="LineNr">215 </span> $loop2:
-<span id="L216" class="LineNr">216 </span><span class="Comment"># address 1 (labels take up no space)</span>
-<span id="L217" class="LineNr">217 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L218" class="LineNr">218 </span><span class="Comment"># address 6</span>
-<span id="L219" class="LineNr">219 </span>            eb                                                                                                              $loop2/disp8
-<span id="L220" class="LineNr">220 </span><span class="Comment"># address 8</span>
-<span id="L221" class="LineNr">221 </span>            eb                                                                                                              $loop3/disp8
-<span id="L222" class="LineNr">222 </span><span class="Comment"># address 0xa</span>
-<span id="L223" class="LineNr">223 </span> $loop3:
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span>
-<span id="L226" class="LineNr">226 </span><span class="traceContains">+transform: label '$loop3' is at address a</span>
-<span id="L227" class="LineNr">227 </span><span class="Comment"># first jump is to -7</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb f9'</span>
-<span id="L229" class="LineNr">229 </span><span class="Comment"># second jump is to 0 (fall through)</span>
-<span id="L230" class="LineNr">230 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb 00'</span>
-<span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(scenario label_too_short)</span>
-<span id="L233" class="LineNr">233 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L234" class="LineNr">234 </span>== <span class="Constant">0x1</span>
-<span id="L235" class="LineNr">235 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L236" class="LineNr">236 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L237" class="LineNr">237 </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="L208" class="LineNr">208 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
+<span id="L209" class="LineNr">209 </span><span class="Comment">//: instructions.</span>
+<span id="L210" class="LineNr">210 </span><span class="Comment">//: They should also be the only word on a line.</span>
+<span id="L211" class="LineNr">211 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
+<span id="L212" class="LineNr">212 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
+<span id="L215" class="LineNr">215 </span>== <span class="Constant">0x1</span>
+<span id="L216" class="LineNr">216 </span><span class="Comment"># address 1</span>
+<span id="L217" class="LineNr">217 </span><span class="Normal">loop</span>:
+<span id="L218" class="LineNr">218 </span> $loop2:
+<span id="L219" class="LineNr">219 </span><span class="Comment"># address 1 (labels take up no space)</span>
+<span id="L220" class="LineNr">220 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L221" class="LineNr">221 </span><span class="Comment"># address 6</span>
+<span id="L222" class="LineNr">222 </span>    eb  $loop2/disp8
+<span id="L223" class="LineNr">223 </span><span class="Comment"># address 8</span>
+<span id="L224" class="LineNr">224 </span>    eb  $loop3/disp8
+<span id="L225" class="LineNr">225 </span><span class="Comment"># address 0xa</span>
+<span id="L226" class="LineNr">226 </span> $loop3:
+<span id="L227" class="LineNr">227 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
+<span id="L228" class="LineNr">228 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span>
+<span id="L229" class="LineNr">229 </span><span class="traceContains">+transform: label '$loop3' is at address a</span>
+<span id="L230" class="LineNr">230 </span><span class="Comment"># first jump is to -7</span>
+<span id="L231" class="LineNr">231 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb f9'</span>
+<span id="L232" class="LineNr">232 </span><span class="Comment"># second jump is to 0 (fall through)</span>
+<span id="L233" class="LineNr">233 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb 00'</span>
+<span id="L234" class="LineNr">234 </span>
+<span id="L235" class="LineNr">235 </span><span class="Delimiter">:(scenario label_too_short)</span>
+<span id="L236" class="LineNr">236 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L237" class="LineNr">237 </span>== <span class="Constant">0x1</span>
 <span id="L238" class="LineNr">238 </span><span class="Normal">xz</span>:
-<span id="L239" class="LineNr">239 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L240" class="LineNr">240 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different <a href='010---vm.cc.html#L336'>name</a></span>
+<span id="L239" class="LineNr">239 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L240" class="LineNr">240 </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="L241" class="LineNr">241 </span>
 <span id="L242" class="LineNr">242 </span><span class="Delimiter">:(scenario label_hex)</span>
 <span id="L243" class="LineNr">243 </span><span class="Special">% Hide_errors = true;</span>
 <span id="L244" class="LineNr">244 </span>== <span class="Constant">0x1</span>
-<span id="L245" class="LineNr">245 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L246" class="LineNr">246 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L247" class="LineNr">247 </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="L248" class="LineNr">248 </span><span class="Constant">0xab</span>:
-<span id="L249" class="LineNr">249 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different <a href='010---vm.cc.html#L336'>name</a></span>
-<span id="L251" class="LineNr">251 </span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
-<span id="L253" class="LineNr">253 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L254" class="LineNr">254 </span>== <span class="Constant">0x1</span>
-<span id="L255" class="LineNr">255 </span>          <span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L256" class="LineNr">256 </span>          <span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L257" class="LineNr">257 </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="L258" class="LineNr">258 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
-<span id="L259" class="LineNr">259 </span>            <span class="PreProc">0</span><span class="Constant">5</span>                                                                                                                              <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># add to EAX</span>
-<span id="L260" class="LineNr">260 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different <a href='010---vm.cc.html#L336'>name</a></span>
-<span id="L261" class="LineNr">261 </span>
-<span id="L262" class="LineNr">262 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
-<span id="L263" class="LineNr">263 </span><span class="Comment">//: ignore them.</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
-<span id="L266" class="LineNr">266 </span>== <a href='031check_operands.cc.html#L14'>code</a>  <span class="Comment"># 0x08048074</span>
-<span id="L267" class="LineNr">267 </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="L268" class="LineNr">268 </span><span class="Normal">foo</span>:                     <span class="Comment"># 0 bytes</span>
-<span id="L269" class="LineNr">269 </span>== data  <span class="Comment"># 0x08049079</span>
-<span id="L270" class="LineNr">270 </span><span class="Normal">bar</span>:
-<span id="L271" class="LineNr">271 </span><span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+transform: segment 1 begins at address 0x08049079</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End num_bytes(curr) Special-cases&quot;)</span>
-<span id="L275" class="LineNr">275 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L150'>is_label</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Delimiter">;</span>  <span class="Comment">// don't count it</span>
+<span id="L245" class="LineNr">245 </span><span class="Constant">0xab</span>:
+<span id="L246" class="LineNr">246 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L247" class="LineNr">247 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different name</span>
+<span id="L248" class="LineNr">248 </span>
+<span id="L249" class="LineNr">249 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
+<span id="L250" class="LineNr">250 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L251" class="LineNr">251 </span>== <span class="Constant">0x1</span>
+<span id="L252" class="LineNr">252 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
+<span id="L253" class="LineNr">253 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L254" class="LineNr">254 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different name</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
+<span id="L257" class="LineNr">257 </span><span class="Comment">//: ignore them.</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
+<span id="L260" class="LineNr">260 </span>== <a href='031check_operands.cc.html#L11'>code</a>  <span class="Comment"># 0x09000074</span>
+<span id="L261" class="LineNr">261 </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="L262" class="LineNr">262 </span><span class="Normal">foo</span>:                      <span class="Comment"># 0 bytes</span>
+<span id="L263" class="LineNr">263 </span>== data  <span class="Comment"># 0x0a000079</span>
+<span id="L264" class="LineNr">264 </span><span class="Normal">bar</span>:
+<span id="L265" class="LineNr">265 </span>  <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L266" class="LineNr">266 </span><span class="traceContains">+transform: segment 1 begins at address 0x0a000079</span>
+<span id="L267" class="LineNr">267 </span>
+<span id="L268" class="LineNr">268 </span><span class="Delimiter">:(before &quot;End num_bytes(curr) Special-cases&quot;)</span>
+<span id="L269" class="LineNr">269 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L156'>is_label</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Delimiter">;</span>  <span class="Comment">// don't count it</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html
index f5e53a17..ac948e92 100644
--- a/html/subx/036global_variables.cc.html
+++ b/html/subx/036global_variables.cc.html
@@ -71,27 +71,27 @@ if ('onhashchange' in window) {
 <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#L14'>code</a>
-<span id="L11" class="LineNr"> 11 </span>b9/copy x/imm32  <span class="Comment"># copy to ECX</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 0x08049079</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><a href='011run.cc.html#L229'>Transform</a><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#L204'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
 <span id="L23" class="LineNr"> 23 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<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#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>  <a href='036global_variables.cc.html#L58'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='036global_variables.cc.html#L63'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<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#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L25" class="LineNr"> 25 </span>  <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
 <span id="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="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="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L14'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<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="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#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
 <span id="L31" class="LineNr"> 31 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>
@@ -105,138 +105,140 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>        ++current_address<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">else</span> <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>        string variable = <a href='035labels.cc.html#L198'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>        string variable = <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
 <span id="L46" class="LineNr"> 46 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
-<span id="L47" class="LineNr"> 47 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L225'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L47" class="LineNr"> 47 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L48" class="LineNr"> 48 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L49" class="LineNr"> 49 </span>          <a href='003trace.cc.html#L211'>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#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
-<span id="L51" class="LineNr"> 51 </span>        <a href='003trace.cc.html#L204'>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#L368'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L52" class="LineNr"> 52 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</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 class="Delimiter">}</span>
-<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">}</span>
-<span id="L57" class="LineNr"> 57 </span>
-<span id="L58" class="LineNr"> 58 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L58'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L14'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L60" class="LineNr"> 60 </span>    <a href='035labels.cc.html#L142'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<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='036global_variables.cc.html#L63'>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="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L65" class="LineNr"> 65 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</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="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L67" class="LineNr"> 67 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L69" class="LineNr"> 69 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L70" class="LineNr"> 70 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L71" class="LineNr"> 71 </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="L72" class="LineNr"> 72 </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="L73" class="LineNr"> 73 </span>          <a href='003trace.cc.html#L211'>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;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L74" class="LineNr"> 74 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L75" class="LineNr"> 75 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>      <span class="Delimiter">}</span>
-<span id="L77" class="LineNr"> 77 </span>      <span class="Normal">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="L78" class="LineNr"> 78 </span>        <a href='003trace.cc.html#L211'>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;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L79" class="LineNr"> 79 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L80" class="LineNr"> 80 </span>      <span class="Delimiter">}</span>
-<span id="L81" class="LineNr"> 81 </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="L82" class="LineNr"> 82 </span>    <span class="Delimiter">}</span>
-<span id="L83" class="LineNr"> 83 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>    <a href='003trace.cc.html#L204'>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#L231'>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="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="Normal">bool</span> <a href='036global_variables.cc.html#L88'>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="L89" class="LineNr"> 89 </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="L90" class="LineNr"> 90 </span>  <span class="Comment">// End Valid Uses Of Global Variable(curr)</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="SalientComment">//:: a more complex sanity check for how we use global variables</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
-<span id="L98" class="LineNr"> 98 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L100'>correlate_disp32_with_mod</a><span class="Delimiter">);</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='036global_variables.cc.html#L100'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <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#L100'>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#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L104" class="LineNr">104 </span>    line&amp; inst = <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </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="L108" class="LineNr">108 </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="L109" class="LineNr">109 </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="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">}</span>
-<span id="L113" class="LineNr">113 </span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before &quot;End Valid Uses Of Global Variable(curr)&quot;)</span>
-<span id="L115" class="LineNr">115 </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="L116" class="LineNr">116 </span>  <span class="Identifier">return</span> <a href='036global_variables.cc.html#L121'>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="L117" class="LineNr">117 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span>
-<span id="L118" class="LineNr">118 </span><span class="Comment">// addresses as a real displacement added to other operands.</span>
-<span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="Delimiter">:(code)</span>
-<span id="L121" class="LineNr">121 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L121'>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="L122" class="LineNr">122 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L123" class="LineNr">123 </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="L124" class="LineNr">124 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span><span class="Delimiter">}</span>
-<span id="L126" class="LineNr">126 </span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_jump)</span>
-<span id="L128" class="LineNr">128 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L129" class="LineNr">129 </span>== <a href='031check_operands.cc.html#L14'>code</a>
-<span id="L130" class="LineNr">130 </span>eb/jump x/disp8
-<span id="L131" class="LineNr">131 </span>== data
-<span id="L132" class="LineNr">132 </span><span class="Normal">x</span>:
-<span id="L133" class="LineNr">133 </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="L134" class="LineNr">134 </span><span class="traceContains">+error: 'eb/jump x/disp8': can't refer to global variable 'x'</span>
-<span id="L135" class="LineNr">135 </span><span class="Comment"># sub-optimal error message; should be</span>
-<span id="L136" class="LineNr">136 </span><span class="CommentedCode">#? +error: can't jump to data (variable 'x')</span>
-<span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_call)</span>
-<span id="L139" class="LineNr">139 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L140" class="LineNr">140 </span>== <a href='031check_operands.cc.html#L14'>code</a>
-<span id="L141" class="LineNr">141 </span>e8/call x/disp32
-<span id="L142" class="LineNr">142 </span>== data
-<span id="L143" class="LineNr">143 </span><span class="Normal">x</span>:
-<span id="L144" class="LineNr">144 </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="L145" class="LineNr">145 </span><span class="traceContains">+error: 'e8/call x/disp32': can't refer to global variable 'x'</span>
-<span id="L146" class="LineNr">146 </span><span class="Comment"># sub-optimal error message; should be</span>
-<span id="L147" class="LineNr">147 </span><span class="CommentedCode">#? +error: can't call to the data segment ('x')</span>
-<span id="L148" class="LineNr">148 </span>
-<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(scenario disp32_data_with_modrm)</span>
-<span id="L150" class="LineNr">150 </span>== <a href='031check_operands.cc.html#L14'>code</a>
-<span id="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span>== data
-<span id="L153" class="LineNr">153 </span><span class="Normal">x</span>:
-<span id="L154" class="LineNr">154 </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="L155" class="LineNr">155 </span>$error: <span class="Constant">0</span>
-<span id="L156" class="LineNr">156 </span>
-<span id="L157" class="LineNr">157 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(scenario disp32_data_with_call)</span>
-<span id="L159" class="LineNr">159 </span>== <a href='031check_operands.cc.html#L14'>code</a>
-<span id="L160" class="LineNr">160 </span><span class="Normal">foo</span>:
-<span id="L161" class="LineNr">161 </span>e8/call bar/disp32
-<span id="L162" class="LineNr">162 </span><span class="Normal">bar</span>:
-<span id="L163" class="LineNr">163 </span>$error: <span class="Constant">0</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(code)</span>
-<span id="L166" class="LineNr">166 </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="L167" class="LineNr">167 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L169" class="LineNr">169 </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="L170" class="LineNr">170 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<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> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L172" class="LineNr">172 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Delimiter">}</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L175" class="LineNr">175 </span><span class="Delimiter">}</span>
+<span id="L49" class="LineNr"> 49 </span>          <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': global variable names can only be the first <a href='011run.cc.html#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L50" class="LineNr"> 50 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
+<span id="L51" class="LineNr"> 51 </span>          <a href='035labels.cc.html#L133'>Map_file</a> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L403'>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="L52" class="LineNr"> 52 </span>        <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L403'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
+<span id="L55" class="LineNr"> 55 </span>      <span class="Delimiter">}</span>
+<span id="L56" class="LineNr"> 56 </span>    <span class="Delimiter">}</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Delimiter">}</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
+<span id="L59" class="LineNr"> 59 </span>
+<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#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#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='035labels.cc.html#L148'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
+<span id="L64" class="LineNr"> 64 </span>
+<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L67" class="LineNr"> 67 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L69" class="LineNr"> 69 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L70" class="LineNr"> 70 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L73" class="LineNr"> 73 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!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="L74" class="LineNr"> 74 </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="L75" class="LineNr"> 75 </span>          <a href='003trace.cc.html#L210'>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;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L76" class="LineNr"> 76 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L77" class="LineNr"> 77 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L78" class="LineNr"> 78 </span>      <span class="Delimiter">}</span>
+<span id="L79" class="LineNr"> 79 </span>      <span class="Normal">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="L80" class="LineNr"> 80 </span>        <a href='003trace.cc.html#L210'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span>    <span class="Delimiter">}</span>
+<span id="L85" class="LineNr"> 85 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>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="L87" class="LineNr"> 87 </span>  <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><span class="Normal">bool</span> <a href='036global_variables.cc.html#L90'>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="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </span>  <span class="Comment">// End Valid Uses Of Global Variable(curr)</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="SalientComment">//:: a more complex sanity check for how we use global variables</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
+<span id="L100" class="LineNr">100 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L102'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
+<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(code)</span>
+<span id="L102" class="LineNr">102 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L102'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L106" class="LineNr">106 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L108" class="LineNr">108 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </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="L110" class="LineNr">110 </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="L111" class="LineNr">111 </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="L112" class="LineNr">112 </span>    <span class="Delimiter">}</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 Valid Uses Of Global Variable(curr)&quot;)</span>
+<span id="L117" class="LineNr">117 </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="L118" class="LineNr">118 </span>  <span class="Identifier">return</span> <a href='036global_variables.cc.html#L123'>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="L119" class="LineNr">119 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span>
+<span id="L120" class="LineNr">120 </span><span class="Comment">// addresses as a real displacement added to other operands.</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span><span class="Delimiter">:(code)</span>
+<span id="L123" class="LineNr">123 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L123'>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="L124" class="LineNr">124 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L125" class="LineNr">125 </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="L126" class="LineNr">126 </span>  <span class="Identifier">return</span><span class="Constant"> false</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="Delimiter">:(scenario global_variable_disallowed_in_jump)</span>
+<span id="L130" class="LineNr">130 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L131" class="LineNr">131 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L132" class="LineNr">132 </span>eb/jump  x/disp8
+<span id="L133" class="LineNr">133 </span>== data
+<span id="L134" class="LineNr">134 </span><span class="Normal">x</span>:
+<span id="L135" class="LineNr">135 </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="L136" class="LineNr">136 </span><span class="traceContains">+error: 'eb/jump x/disp8': can't refer to global variable 'x'</span>
+<span id="L137" class="LineNr">137 </span><span class="Comment"># sub-optimal error message; should be</span>
+<span id="L138" class="LineNr">138 </span><span class="CommentedCode">#? +error: can't jump to data (variable 'x')</span>
+<span id="L139" class="LineNr">139 </span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_call)</span>
+<span id="L141" class="LineNr">141 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L142" class="LineNr">142 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L143" class="LineNr">143 </span>e8/call  x/disp32
+<span id="L144" class="LineNr">144 </span>== data
+<span id="L145" class="LineNr">145 </span><span class="Normal">x</span>:
+<span id="L146" class="LineNr">146 </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="L147" class="LineNr">147 </span><span class="traceContains">+error: 'e8/call x/disp32': can't refer to global variable 'x'</span>
+<span id="L148" class="LineNr">148 </span><span class="Comment"># sub-optimal error message; should be</span>
+<span id="L149" class="LineNr">149 </span><span class="CommentedCode">#? +error: can't call to the data segment ('x')</span>
+<span id="L150" class="LineNr">150 </span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">:(scenario disp32_data_with_modrm)</span>
+<span id="L152" class="LineNr">152 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L153" class="LineNr">153 </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="L154" class="LineNr">154 </span>== data
+<span id="L155" class="LineNr">155 </span><span class="Normal">x</span>:
+<span id="L156" class="LineNr">156 </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="L157" class="LineNr">157 </span>$error: <span class="Constant">0</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(scenario disp32_data_with_call)</span>
+<span id="L161" class="LineNr">161 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L162" class="LineNr">162 </span><span class="Normal">foo</span>:
+<span id="L163" class="LineNr">163 </span>e8/call bar/disp32
+<span id="L164" class="LineNr">164 </span><span class="Normal">bar</span>:
+<span id="L165" class="LineNr">165 </span>$error: <span class="Constant">0</span>
+<span id="L166" class="LineNr">166 </span>
+<span id="L167" class="LineNr">167 </span><span class="Delimiter">:(code)</span>
+<span id="L168" class="LineNr">168 </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="L169" class="LineNr">169 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L171" class="LineNr">171 </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="L172" class="LineNr">172 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L174" class="LineNr">174 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Delimiter">}</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html
index 25066a8b..479e1731 100644
--- a/html/subx/038---literal_strings.cc.html
+++ b/html/subx/038---literal_strings.cc.html
@@ -65,8 +65,8 @@ if ('onhashchange' in window) {
 <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#L14'>code</a>
-<span id="L8" class="LineNr">  8 </span>  b8/copy <span class="Constant">&quot;test&quot;</span>/imm32  <span class="Comment"># copy to EAX</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>
@@ -84,12 +84,12 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span><span class="Normal">int</span> <a href='038---literal_strings.cc.html#L23'>Next_auto_global</a> = <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#L204'>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;-- move literal strings to data segment&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- 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#L100'>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#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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#L109'>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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L33" class="LineNr"> 33 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="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>
@@ -99,7 +99,7 @@ if ('onhashchange' in window) {
 <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#L204'>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#L231'>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="L41" class="LineNr"> 41 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>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#L109'>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#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -110,10 +110,10 @@ if ('onhashchange' in window) {
 <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#L109'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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; <a href='010---vm.cc.html#L336'>name</a><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#L204'>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="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#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;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#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><a href='010---vm.cc.html#L336'>name</a><span class="Delimiter">));</span>
+<span id="L55" class="LineNr"> 55 </span>  data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>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#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L157'>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>
@@ -123,7 +123,7 @@ if ('onhashchange' in window) {
 <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#L157'>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#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
-<span id="L65" class="LineNr"> 65 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L275'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span>
+<span id="L65" class="LineNr"> 65 </span>    curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>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#L118'>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>
@@ -160,7 +160,7 @@ if ('onhashchange' in window) {
 <span id="L99" class="LineNr"> 99 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
 <span id="L100" class="LineNr">100 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L103" class="LineNr">103 </span>    <a href='038---literal_strings.cc.html#L136'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
 <span id="L104" class="LineNr">104 </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="L105" class="LineNr">105 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
@@ -175,20 +175,20 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span>    w &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L115" class="LineNr">115 </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="L116" class="LineNr">116 </span>      <span class="Comment">// slurp until '&quot;'</span>
-<span id="L117" class="LineNr">117 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L117" class="LineNr">117 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
 <span id="L118" class="LineNr">118 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
 <span id="L119" class="LineNr">119 </span>        w &lt;&lt; c<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="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 class="Delimiter">}</span>
 <span id="L123" class="LineNr">123 </span>    <span class="Comment">// slurp any remaining characters until whitespace</span>
-<span id="L124" class="LineNr">124 </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#L260'>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="L124" class="LineNr">124 </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#L265'>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="L125" class="LineNr">125 </span>      in &gt;&gt; c<span class="Delimiter">;</span>
 <span id="L126" class="LineNr">126 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
 <span id="L127" class="LineNr">127 </span>    <span class="Delimiter">}</span>
 <span id="L128" class="LineNr">128 </span>    result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
 <span id="L129" class="LineNr">129 </span>    <a href='011run.cc.html#L191'>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#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
-<span id="L130" class="LineNr">130 </span>    <a href='003trace.cc.html#L204'>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#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>    <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;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#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L131" class="LineNr">131 </span>  <span class="Delimiter">}</span>
 <span id="L132" class="LineNr">132 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
 <span id="L133" class="LineNr">133 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
@@ -196,15 +196,15 @@ if ('onhashchange' in window) {
 <span id="L135" class="LineNr">135 </span>
 <span id="L136" class="LineNr">136 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L136'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L137" class="LineNr">137 </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="L138" class="LineNr">138 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>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="L138" class="LineNr">138 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>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="L139" class="LineNr">139 </span>    <span class="Normal">else</span> <span class="Identifier">break</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="Delimiter">}</span>
 <span id="L142" class="LineNr">142 </span>
 <span id="L143" class="LineNr">143 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L143'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>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="L144" class="LineNr">144 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>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="L145" class="LineNr">145 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L146" class="LineNr">146 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L260'>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="L146" class="LineNr">146 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>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="L147" class="LineNr">147 </span>  <span class="Delimiter">}</span>
 <span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span>
 <span id="L149" class="LineNr">149 </span>
@@ -268,7 +268,7 @@ if ('onhashchange' in window) {
 <span id="L207" class="LineNr">207 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
 <span id="L208" class="LineNr">208 </span>      <span class="Constant">&quot;68/push </span><span class="cSpecial">\&quot;</span><span class="Constant">test</span><span class="cSpecial">\&quot;</span><span class="Constant">/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
 <span id="L209" class="LineNr">209 </span>  <span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L258'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
 <span id="L211" class="LineNr">211 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D&quot;</span>
 <span id="L212" class="LineNr">212 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: </span><span class="cSpecial">\&quot;</span><span class="Constant">test</span><span class="cSpecial">\&quot;</span><span class="Constant"> /f^D&quot;</span>
 <span id="L213" class="LineNr">213 </span>  <span class="Delimiter">);</span>
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html
new file mode 100644
index 00000000..9cf21c15
--- /dev/null
+++ b/html/subx/039debug.cc.html
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/039debug.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Some helpers for debugging.</span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">// Load the 'map' file generated during 'subx --map translate' when running 'subx --map --dump run'.</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">// (It'll only affect the trace.)</span>
+<span id="L5" class="LineNr"> 5 </span>
+<span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L7" class="LineNr"> 7 </span>map&lt;<span class="Comment">/*</span><span class="Comment">address</span><span class="Comment">*/</span><span class="Normal">uint32_t</span><span class="Delimiter">,</span> string&gt; <a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">;</span>  <span class="Comment">// used only by 'subx run'</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(before &quot;End --map Settings&quot;)</span>
+<span id="L9" class="LineNr"> 9 </span><a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
+<span id="L10" class="LineNr">10 </span><span class="Delimiter">:(code)</span>
+<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> <a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L12" class="LineNr">12 </span>  ifstream fin<span class="Delimiter">(</span>map_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L13" class="LineNr">13 </span>  fin &gt;&gt; std::hex<span class="Delimiter">;</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L15" class="LineNr">15 </span>    <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L16" class="LineNr">16 </span>    fin &gt;&gt; addr<span class="Delimiter">;</span>
+<span id="L17" class="LineNr">17 </span>    string name<span class="Delimiter">;</span>
+<span id="L18" class="LineNr">18 </span>    fin &gt;&gt; name<span class="Delimiter">;</span>
+<span id="L19" class="LineNr">19 </span>    <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span>
+<span id="L20" class="LineNr">20 </span>  <span class="Delimiter">}</span>
+<span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span>
+<span id="L22" class="LineNr">22 </span>
+<span id="L23" class="LineNr">23 </span><span class="Delimiter">:(after &quot;Run One Instruction&quot;)</span>
+<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span><a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">))</span>
+<span id="L25" class="LineNr">25 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;== label &quot;</span> &lt;&lt; get<span class="Delimiter">(</span><a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/040---tests.cc.html b/html/subx/040---tests.cc.html
index b51870bc..ae707d92 100644
--- a/html/subx/040---tests.cc.html
+++ b/html/subx/040---tests.cc.html
@@ -73,36 +73,36 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span><span class="Special">% Reg[ESP].u = 0x100;</span>
 <span id="L12" class="LineNr">12 </span>== <span class="Constant">0x1</span>
 <span id="L13" class="LineNr">13 </span><span class="Normal"><a href='000organization.cc.html#L113'>main</a></span>:
-<span id="L14" class="LineNr">14 </span>  e8/call run_tests/disp32  <span class="Comment"># 5 bytes</span>
+<span id="L14" class="LineNr">14 </span>  e8/call run-tests/disp32  <span class="Comment"># 5 bytes</span>
 <span id="L15" class="LineNr">15 </span>  f4/halt                   <span class="Comment"># 1 byte</span>
 <span id="L16" class="LineNr">16 </span>
-<span id="L17" class="LineNr">17 </span><span class="Normal">test_foo</span>:  <span class="Comment"># offset 7</span>
+<span id="L17" class="LineNr">17 </span>test-foo:  <span class="Comment"># offset 7</span>
 <span id="L18" class="LineNr">18 </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="L19" class="LineNr">19 </span>  c3/<span class="Identifier">return</span>
 <span id="L20" class="LineNr">20 </span>
-<span id="L21" class="LineNr">21 </span><span class="Comment"># check that code in test_foo ran (implicitly called by run_tests)</span>
+<span id="L21" class="LineNr">21 </span><span class="Comment"># check that code in test_foo ran (implicitly called by run-tests)</span>
 <span id="L22" class="LineNr">22 </span><span class="traceContains">+run: inst: 0x00000007</span>
 <span id="L23" class="LineNr">23 </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> create_test_function<span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L26" class="LineNr">26 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L27" class="LineNr">27 </span>  segment&amp; <a href='031check_operands.cc.html#L14'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L28" class="LineNr">28 </span>  <a href='003trace.cc.html#L204'>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;-- create 'run_tests'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L27" class="LineNr">27 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L28" class="LineNr">28 </span>  <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- create 'run-tests'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L29" class="LineNr">29 </span>  vector&lt;line&gt; <a href='040---tests.cc.html#L29'>new_insts</a><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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>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#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="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#L109'>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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L33" class="LineNr">33 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
 <span id="L34" class="LineNr">34 </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="L35" class="LineNr">35 </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="L36" class="LineNr">36 </span>      string fn = <a href='035labels.cc.html#L198'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L35" class="LineNr">35 </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="L36" class="LineNr">36 </span>      string fn = <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L37" class="LineNr">37 </span>      <a href='040---tests.cc.html#L29'>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="L38" class="LineNr">38 </span>    <span class="Delimiter">}</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Delimiter">}</span>
 <span id="L40" class="LineNr">40 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='040---tests.cc.html#L29'>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="L41" class="LineNr">41 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>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="L42" class="LineNr">42 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L43" class="LineNr">43 </span>  <a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ret<span class="Delimiter">());</span>
+<span id="L41" class="LineNr">41 </span>  <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>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="L42" class="LineNr">42 </span>  <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L29'>new_insts</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L43" class="LineNr">43 </span>  <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ret<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>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
diff --git a/html/subx/050_write.subx.html b/html/subx/050_write.subx.html
new file mode 100644
index 00000000..ec944002
--- /dev/null
+++ b/html/subx/050_write.subx.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/050_write.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment"># _write: write to a file descriptor</span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span>== code
+<span id="L4" class="LineNr"> 4 </span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L7" class="LineNr"> 7 </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="L8" class="LineNr"> 8 </span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Comment"># syscall(exit, 0) -- can't test these functions just yet</span>
+<span id="L11" class="LineNr">11 </span>  bb/copy-to-EBX  0/imm32
+<span id="L12" class="LineNr">12 </span>  b8/copy-to-EAX  1/imm32
+<span id="L13" class="LineNr">13 </span>  cd/syscall  0x80/imm8
+<span id="L14" class="LineNr">14 </span>
+<span id="L15" class="LineNr">15 </span>_write:  <span class="Comment"># fd : int, s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># prolog</span>
+<span id="L17" class="LineNr">17 </span>  55/push-EBP
+<span id="L18" class="LineNr">18 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Comment"># save registers</span>
+<span id="L20" class="LineNr">20 </span>  50/push-EAX
+<span id="L21" class="LineNr">21 </span>  51/push-ECX
+<span id="L22" class="LineNr">22 </span>  52/push-EDX
+<span id="L23" class="LineNr">23 </span>  53/push-EBX
+<span id="L24" class="LineNr">24 </span>  <span class="Comment"># syscall(write, fd, (data) s+4, (size) *s)</span>
+<span id="L25" class="LineNr">25 </span>    <span class="Comment"># fd : EBX</span>
+<span id="L26" class="LineNr">26 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
+<span id="L27" class="LineNr">27 </span>    <span class="Comment"># data : ECX = s+4</span>
+<span id="L28" class="LineNr">28 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ECX</span>
+<span id="L29" class="LineNr">29 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ECX</span>
+<span id="L30" class="LineNr">30 </span>    <span class="Comment"># size : EDX = *s</span>
+<span id="L31" class="LineNr">31 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
+<span id="L32" class="LineNr">32 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Comment"># syscall</span>
+<span id="L34" class="LineNr">34 </span>  b8/copy-to-EAX  4/imm32/write
+<span id="L35" class="LineNr">35 </span>  cd/syscall  0x80/imm8
+<span id="L36" class="LineNr">36 </span>  <span class="Comment"># restore registers</span>
+<span id="L37" class="LineNr">37 </span>  5b/pop-to-EBX
+<span id="L38" class="LineNr">38 </span>  5a/pop-to-EDX
+<span id="L39" class="LineNr">39 </span>  59/pop-to-ECX
+<span id="L40" class="LineNr">40 </span>  58/pop-to-EAX
+<span id="L41" class="LineNr">41 </span>  <span class="Comment"># epilog</span>
+<span id="L42" class="LineNr">42 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L43" class="LineNr">43 </span>  5d/pop-to-EBP
+<span id="L44" class="LineNr">44 </span>  c3/return
+<span id="L45" class="LineNr">45 </span>
+<span id="L46" class="LineNr">46 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/051test.subx.html b/html/subx/051test.subx.html
index 225e011d..1ebeb22b 100644
--- a/html/subx/051test.subx.html
+++ b/html/subx/051test.subx.html
@@ -53,71 +53,93 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span>== code
+<span id="L1" class="LineNr"> 1 </span><span class="Comment"># Rudimentary test harness</span>
 <span id="L2" class="LineNr"> 2 </span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L5" class="LineNr"> 5 </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="L6" class="LineNr"> 6 </span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L8" class="LineNr"> 8 </span>check_ints_equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
-<span id="L9" class="LineNr"> 9 </span>  <span class="Comment"># prolog</span>
-<span id="L10" class="LineNr">10 </span>  55/push-EBP
-<span id="L11" class="LineNr">11 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L12" class="LineNr">12 </span>  <span class="Comment"># save registers</span>
-<span id="L13" class="LineNr">13 </span>  51/push-ECX
-<span id="L14" class="LineNr">14 </span>  53/push-EBX
-<span id="L15" class="LineNr">15 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
-<span id="L16" class="LineNr">16 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L17" class="LineNr">17 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
-<span id="L18" class="LineNr">18 </span>  <span class="Comment"># if EAX == b/EBX</span>
-<span id="L19" class="LineNr">19 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
-<span id="L20" class="LineNr">20 </span>  75/jump-if-unequal  $check_ints_equal:else/disp8
-<span id="L21" class="LineNr">21 </span>    <span class="Comment"># print('.')</span>
-<span id="L22" class="LineNr">22 </span>      <span class="Comment"># push args</span>
-<span id="L23" class="LineNr">23 </span>  68/push  &quot;.&quot;/imm32
-<span id="L24" class="LineNr">24 </span>      <span class="Comment"># call</span>
-<span id="L25" class="LineNr">25 </span>  e8/call  write_stderr/disp32
-<span id="L26" class="LineNr">26 </span>      <span class="Comment"># discard arg</span>
-<span id="L27" class="LineNr">27 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L28" class="LineNr">28 </span>    <span class="Comment"># return</span>
-<span id="L29" class="LineNr">29 </span>  eb/jump  $check_ints_equal:end/disp8
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># else:</span>
-<span id="L31" class="LineNr">31 </span>$check_ints_equal:else:
-<span id="L32" class="LineNr">32 </span>  <span class="Comment"># copy msg into ECX</span>
-<span id="L33" class="LineNr">33 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
-<span id="L34" class="LineNr">34 </span>    <span class="Comment"># print(ECX)</span>
-<span id="L35" class="LineNr">35 </span>      <span class="Comment"># push args</span>
-<span id="L36" class="LineNr">36 </span>  51/push-ECX
-<span id="L37" class="LineNr">37 </span>      <span class="Comment"># call</span>
-<span id="L38" class="LineNr">38 </span>  e8/call  write_stderr/disp32
-<span id="L39" class="LineNr">39 </span>      <span class="Comment"># discard arg</span>
-<span id="L40" class="LineNr">40 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L41" class="LineNr">41 </span>    <span class="Comment"># print newline</span>
-<span id="L42" class="LineNr">42 </span>      <span class="Comment"># push args</span>
-<span id="L43" class="LineNr">43 </span>  68/push  Newline/imm32
-<span id="L44" class="LineNr">44 </span>      <span class="Comment"># call</span>
-<span id="L45" class="LineNr">45 </span>  e8/call  write_stderr/disp32
-<span id="L46" class="LineNr">46 </span>      <span class="Comment"># discard arg</span>
-<span id="L47" class="LineNr">47 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L48" class="LineNr">48 </span>$check_ints_equal:end:
-<span id="L49" class="LineNr">49 </span>  <span class="Comment"># restore registers</span>
-<span id="L50" class="LineNr">50 </span>  5b/pop-to-EBX
-<span id="L51" class="LineNr">51 </span>  59/pop-to-ECX
-<span id="L52" class="LineNr">52 </span>  <span class="Comment"># end</span>
-<span id="L53" class="LineNr">53 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L54" class="LineNr">54 </span>  5d/pop-to-EBP
-<span id="L55" class="LineNr">55 </span>  c3/return
-<span id="L56" class="LineNr">56 </span>
-<span id="L57" class="LineNr">57 </span>== data
-<span id="L58" class="LineNr">58 </span>
-<span id="L59" class="LineNr">59 </span>Newline:
-<span id="L60" class="LineNr">60 </span>  <span class="Comment"># size</span>
-<span id="L61" class="LineNr">61 </span>  01 00 00 00
-<span id="L62" class="LineNr">62 </span>  <span class="Comment"># data</span>
-<span id="L63" class="LineNr">63 </span>  0a/newline
-<span id="L64" class="LineNr">64 </span>
-<span id="L65" class="LineNr">65 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L3" class="LineNr"> 3 </span>== code
+<span id="L4" class="LineNr"> 4 </span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L7" class="LineNr"> 7 </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="L8" class="LineNr"> 8 </span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Comment"># check-ints-equal(34, 34) == 1</span>
+<span id="L11" class="LineNr">11 </span>  68/push  &quot;error in check-ints-equal&quot;/imm32
+<span id="L12" class="LineNr">12 </span>  68/push  35/imm32
+<span id="L13" class="LineNr">13 </span>  68/push  34/imm32
+<span id="L14" class="LineNr">14 </span>  e8/call  check-ints-equal/disp32
+<span id="L15" class="LineNr">15 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># syscall(exit, 0)</span>
+<span id="L17" class="LineNr">17 </span>  bb/copy-to-EBX  0/imm32
+<span id="L18" class="LineNr">18 </span>  b8/copy-to-EAX  1/imm32
+<span id="L19" class="LineNr">19 </span>  cd/syscall  0x80/imm8
+<span id="L20" class="LineNr">20 </span>
+<span id="L21" class="LineNr">21 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L22" class="LineNr">22 </span>check-ints-equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># prolog</span>
+<span id="L24" class="LineNr">24 </span>  55/push-EBP
+<span id="L25" class="LineNr">25 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L26" class="LineNr">26 </span>  <span class="Comment"># save registers</span>
+<span id="L27" class="LineNr">27 </span>  51/push-ECX
+<span id="L28" class="LineNr">28 </span>  53/push-EBX
+<span id="L29" class="LineNr">29 </span>  <span class="Comment"># load first 2 args into EAX and EBX</span>
+<span id="L30" class="LineNr">30 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L31" class="LineNr">31 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
+<span id="L32" class="LineNr">32 </span>  <span class="Comment"># if EAX == b/EBX</span>
+<span id="L33" class="LineNr">33 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L34" class="LineNr">34 </span>  75/jump-if-unequal  $check-ints-equal:else/disp8
+<span id="L35" class="LineNr">35 </span>    <span class="Comment"># _write(2/stderr, '.')</span>
+<span id="L36" class="LineNr">36 </span>      <span class="Comment"># push args</span>
+<span id="L37" class="LineNr">37 </span>  68/push  &quot;.&quot;/imm32
+<span id="L38" class="LineNr">38 </span>  68/push  2/imm32/stderr
+<span id="L39" class="LineNr">39 </span>      <span class="Comment"># call</span>
+<span id="L40" class="LineNr">40 </span>  e8/call  _write/disp32
+<span id="L41" class="LineNr">41 </span>      <span class="Comment"># discard arg</span>
+<span id="L42" class="LineNr">42 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L43" class="LineNr">43 </span>    <span class="Comment"># return</span>
+<span id="L44" class="LineNr">44 </span>  eb/jump  $check-ints-equal:end/disp8
+<span id="L45" class="LineNr">45 </span>  <span class="Comment"># else:</span>
+<span id="L46" class="LineNr">46 </span>$check-ints-equal:else:
+<span id="L47" class="LineNr">47 </span>  <span class="Comment"># copy third arg (msg) into ECX</span>
+<span id="L48" class="LineNr">48 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
+<span id="L49" class="LineNr">49 </span>    <span class="Comment"># _write(2/stderr, ECX)</span>
+<span id="L50" class="LineNr">50 </span>      <span class="Comment"># push args</span>
+<span id="L51" class="LineNr">51 </span>  51/push-ECX
+<span id="L52" class="LineNr">52 </span>  68/push  2/imm32/stderr
+<span id="L53" class="LineNr">53 </span>      <span class="Comment"># call</span>
+<span id="L54" class="LineNr">54 </span>  e8/call  _write/disp32
+<span id="L55" class="LineNr">55 </span>      <span class="Comment"># discard arg</span>
+<span id="L56" class="LineNr">56 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L57" class="LineNr">57 </span>    <span class="Comment"># print newline</span>
+<span id="L58" class="LineNr">58 </span>      <span class="Comment"># push args</span>
+<span id="L59" class="LineNr">59 </span>  68/push  Newline/imm32
+<span id="L60" class="LineNr">60 </span>  68/push  2/imm32/stderr
+<span id="L61" class="LineNr">61 </span>      <span class="Comment"># call</span>
+<span id="L62" class="LineNr">62 </span>  e8/call  _write/disp32
+<span id="L63" class="LineNr">63 </span>      <span class="Comment"># discard arg</span>
+<span id="L64" class="LineNr">64 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L65" class="LineNr">65 </span>    <span class="Comment"># increment Num-test-failures</span>
+<span id="L66" class="LineNr">66 </span>  ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          Num-test-failures/disp32          <span class="Comment"># increment *Num-test-failures</span>
+<span id="L67" class="LineNr">67 </span>$check-ints-equal:end:
+<span id="L68" class="LineNr">68 </span>  <span class="Comment"># restore registers</span>
+<span id="L69" class="LineNr">69 </span>  5b/pop-to-EBX
+<span id="L70" class="LineNr">70 </span>  59/pop-to-ECX
+<span id="L71" class="LineNr">71 </span>  <span class="Comment"># epilog</span>
+<span id="L72" class="LineNr">72 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L73" class="LineNr">73 </span>  5d/pop-to-EBP
+<span id="L74" class="LineNr">74 </span>  c3/return
+<span id="L75" class="LineNr">75 </span>
+<span id="L76" class="LineNr">76 </span>== data
+<span id="L77" class="LineNr">77 </span>
+<span id="L78" class="LineNr">78 </span>Newline:
+<span id="L79" class="LineNr">79 </span>  <span class="Comment"># size</span>
+<span id="L80" class="LineNr">80 </span>  01 00 00 00
+<span id="L81" class="LineNr">81 </span>  <span class="Comment"># data</span>
+<span id="L82" class="LineNr">82 </span>  0a/newline
+<span id="L83" class="LineNr">83 </span>
+<span id="L84" class="LineNr">84 </span>Num-test-failures:
+<span id="L85" class="LineNr">85 </span>  00 00 00 00
+<span id="L86" class="LineNr">86 </span>
+<span id="L87" class="LineNr">87 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/052kernel_string_equal.subx.html b/html/subx/052kernel_string_equal.subx.html
index 7e72aced..5322761d 100644
--- a/html/subx/052kernel_string_equal.subx.html
+++ b/html/subx/052kernel_string_equal.subx.html
@@ -77,15 +77,15 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </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="L22" class="LineNr"> 22 </span>
 <span id="L23" class="LineNr"> 23 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
-<span id="L24" class="LineNr"> 24 </span>  e8/call  run_tests/disp32  <span class="Comment"># 'run_tests' is a function created automatically by SubX. It calls all functions that start with 'test_'.</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L26" class="LineNr"> 26 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L27" class="LineNr"> 27 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
+<span id="L24" class="LineNr"> 24 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># exit(Num-test-failures)</span>
+<span id="L26" class="LineNr"> 26 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   Num-test-failures/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L27" class="LineNr"> 27 </span>  b8/copy-to-EAX  1/imm32
 <span id="L28" class="LineNr"> 28 </span>  cd/syscall  0x80/imm8
 <span id="L29" class="LineNr"> 29 </span>
 <span id="L30" class="LineNr"> 30 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L32" class="LineNr"> 32 </span>kernel_string_equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L32" class="LineNr"> 32 </span>kernel-string-equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Comment"># prolog</span>
 <span id="L34" class="LineNr"> 34 </span>  55/push-EBP
 <span id="L35" class="LineNr"> 35 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
@@ -109,211 +109,213 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span>  <span class="Comment">#     if c1 != c2</span>
 <span id="L54" class="LineNr"> 54 </span>  <span class="Comment">#       return false</span>
 <span id="L55" class="LineNr"> 55 </span>  <span class="Comment">#   return *s1 == 0</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># initialize s into EDI</span>
-<span id="L57" class="LineNr"> 57 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDI</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># initialize benchmark length n into EDX</span>
-<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
-<span id="L60" class="LineNr"> 60 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Comment"># initialize benchmark data into ESI</span>
-<span id="L62" class="LineNr"> 62 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L63" class="LineNr"> 63 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESI</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
-<span id="L65" class="LineNr"> 65 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32/exit      <span class="Comment"># copy to ECX</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
-<span id="L67" class="LineNr"> 67 </span>$kernel_string_loop:
-<span id="L68" class="LineNr"> 68 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
-<span id="L69" class="LineNr"> 69 </span>  74/jump-if-equal  $kernel_string_break/disp8
-<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
-<span id="L71" class="LineNr"> 71 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
-<span id="L72" class="LineNr"> 72 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
-<span id="L73" class="LineNr"> 73 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
-<span id="L74" class="LineNr"> 74 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># if (c1 == 0) return false</span>
-<span id="L76" class="LineNr"> 76 </span>  3d/compare-EAX  0/imm32
-<span id="L77" class="LineNr"> 77 </span>  74/jump-if-equal  $kernel_string_fail/disp8
-<span id="L78" class="LineNr"> 78 </span>    <span class="Comment"># if (c1 != c2) return false</span>
-<span id="L79" class="LineNr"> 79 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
-<span id="L80" class="LineNr"> 80 </span>  75/jump-if-not-equal  $kernel_string_fail/disp8
-<span id="L81" class="LineNr"> 81 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
-<span id="L82" class="LineNr"> 82 </span>  41/inc-ECX
-<span id="L83" class="LineNr"> 83 </span>  46/inc-ESI
-<span id="L84" class="LineNr"> 84 </span>  47/inc-EDI
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># end while</span>
-<span id="L86" class="LineNr"> 86 </span>  eb/jump  $kernel_string_loop/disp8
-<span id="L87" class="LineNr"> 87 </span>$kernel_string_break:
-<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
-<span id="L89" class="LineNr"> 89 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
-<span id="L90" class="LineNr"> 90 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
-<span id="L91" class="LineNr"> 91 </span>  3d/compare-EAX  0/imm32
-<span id="L92" class="LineNr"> 92 </span>  75/jump-if-not-equal  $kernel_string_fail/disp8
-<span id="L93" class="LineNr"> 93 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L94" class="LineNr"> 94 </span>  eb/jump  $kernel_string_end/disp8
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># return false</span>
-<span id="L96" class="LineNr"> 96 </span>$kernel_string_fail:
-<span id="L97" class="LineNr"> 97 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L98" class="LineNr"> 98 </span>
-<span id="L99" class="LineNr"> 99 </span>$kernel_string_end:
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># restore registers</span>
-<span id="L101" class="LineNr">101 </span>  5f/pop-to-EDI
-<span id="L102" class="LineNr">102 </span>  5e/pop-to-ESI
-<span id="L103" class="LineNr">103 </span>  5b/pop-to-EBX
-<span id="L104" class="LineNr">104 </span>  5a/pop-to-EDX
-<span id="L105" class="LineNr">105 </span>  59/pop-to-ECX
-<span id="L106" class="LineNr">106 </span>  <span class="Comment"># end</span>
-<span id="L107" class="LineNr">107 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L108" class="LineNr">108 </span>  5d/pop-to-EBP
-<span id="L109" class="LineNr">109 </span>  c3/return
-<span id="L110" class="LineNr">110 </span>
-<span id="L111" class="LineNr">111 </span><span class="SalientComment">## tests</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Comment">#</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="Comment"># initialize s into EDI</span>
+<span id="L58" class="LineNr"> 58 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDI</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Comment"># initialize benchmark length n into EDX</span>
+<span id="L60" class="LineNr"> 60 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
+<span id="L61" class="LineNr"> 61 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># initialize benchmark data into ESI</span>
+<span id="L63" class="LineNr"> 63 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
+<span id="L64" class="LineNr"> 64 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESI</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
+<span id="L66" class="LineNr"> 66 </span>  b9/copy-to-ECX  0/imm32/exit
+<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
+<span id="L68" class="LineNr"> 68 </span>$kernel-string-equal:loop:
+<span id="L69" class="LineNr"> 69 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
+<span id="L70" class="LineNr"> 70 </span>  74/jump-if-equal  $kernel-string-equal:break/disp8
+<span id="L71" class="LineNr"> 71 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
+<span id="L72" class="LineNr"> 72 </span>  b8/copy-to-EAX  0/imm32
+<span id="L73" class="LineNr"> 73 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L74" class="LineNr"> 74 </span>  bb/copy-to-EBX  0/imm32
+<span id="L75" class="LineNr"> 75 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Comment"># if (c1 == 0) return false</span>
+<span id="L77" class="LineNr"> 77 </span>  3d/compare-EAX  0/imm32
+<span id="L78" class="LineNr"> 78 </span>  74/jump-if-equal  $kernel-string-equal:false/disp8
+<span id="L79" class="LineNr"> 79 </span>    <span class="Comment"># if (c1 != c2) return false</span>
+<span id="L80" class="LineNr"> 80 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
+<span id="L81" class="LineNr"> 81 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
+<span id="L82" class="LineNr"> 82 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
+<span id="L83" class="LineNr"> 83 </span>  41/inc-ECX
+<span id="L84" class="LineNr"> 84 </span>  46/inc-ESI
+<span id="L85" class="LineNr"> 85 </span>  47/inc-EDI
+<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># end while</span>
+<span id="L87" class="LineNr"> 87 </span>  eb/jump  $kernel-string-equal:loop/disp8
+<span id="L88" class="LineNr"> 88 </span>$kernel-string-equal:break:
+<span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
+<span id="L90" class="LineNr"> 90 </span>  b8/copy-to-EAX  0/imm32
+<span id="L91" class="LineNr"> 91 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L92" class="LineNr"> 92 </span>  3d/compare-EAX  0/imm32
+<span id="L93" class="LineNr"> 93 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
+<span id="L94" class="LineNr"> 94 </span>$kernel-string-equal:true:
+<span id="L95" class="LineNr"> 95 </span>  b8/copy-to-EAX  1/imm32
+<span id="L96" class="LineNr"> 96 </span>  eb/jump  $kernel-string-equal:end/disp8
+<span id="L97" class="LineNr"> 97 </span>  <span class="Comment"># return false</span>
+<span id="L98" class="LineNr"> 98 </span>$kernel-string-equal:false:
+<span id="L99" class="LineNr"> 99 </span>  b8/copy-to-EAX  0/imm32
+<span id="L100" class="LineNr">100 </span>
+<span id="L101" class="LineNr">101 </span>$kernel-string-equal:end:
+<span id="L102" class="LineNr">102 </span>  <span class="Comment"># restore registers</span>
+<span id="L103" class="LineNr">103 </span>  5f/pop-to-EDI
+<span id="L104" class="LineNr">104 </span>  5e/pop-to-ESI
+<span id="L105" class="LineNr">105 </span>  5b/pop-to-EBX
+<span id="L106" class="LineNr">106 </span>  5a/pop-to-EDX
+<span id="L107" class="LineNr">107 </span>  59/pop-to-ECX
+<span id="L108" class="LineNr">108 </span>  <span class="Comment"># epilog</span>
+<span id="L109" class="LineNr">109 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L110" class="LineNr">110 </span>  5d/pop-to-EBP
+<span id="L111" class="LineNr">111 </span>  c3/return
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span>test_compare_null_kernel_string_with_empty_array:
-<span id="L114" class="LineNr">114 </span>  <span class="Comment"># EAX = kernel_string_equal(Null_kernel_string, &quot;&quot;)</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># push args</span>
-<span id="L116" class="LineNr">116 </span>  68/push  &quot;&quot;/imm32
-<span id="L117" class="LineNr">117 </span>  68/push  Null_kernel_string/imm32
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># call</span>
-<span id="L119" class="LineNr">119 </span>  e8/call  kernel_string_equal/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="Comment"># discard args</span>
-<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># call check_ints_equal(EAX, 1, msg)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># push args</span>
-<span id="L124" class="LineNr">124 </span>  68/push  &quot;F - test_compare_null_kernel_string_with_empty_array&quot;/imm32
-<span id="L125" class="LineNr">125 </span>  68/push  1/imm32/true
-<span id="L126" class="LineNr">126 </span>  50/push-EAX
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># call</span>
-<span id="L128" class="LineNr">128 </span>  e8/call  check_ints_equal/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="Comment"># discard args</span>
-<span id="L130" class="LineNr">130 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L131" class="LineNr">131 </span>  c3/return
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span>test_compare_null_kernel_string_with_non_empty_array:
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># EAX = kernel_string_equal(Null_kernel_string, &quot;Abc&quot;)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># push args</span>
-<span id="L136" class="LineNr">136 </span>  68/push  &quot;Abc&quot;/imm32
-<span id="L137" class="LineNr">137 </span>  68/push  Null_kernel_string/imm32
-<span id="L138" class="LineNr">138 </span>    <span class="Comment"># call</span>
-<span id="L139" class="LineNr">139 </span>  e8/call  kernel_string_equal/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># discard args</span>
-<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment"># call check_ints_equal(EAX, 0, msg)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># push args</span>
-<span id="L144" class="LineNr">144 </span>  68/push  &quot;F - test_compare_null_kernel_string_with_non_empty_array&quot;/imm32
-<span id="L145" class="LineNr">145 </span>  68/push  0/imm32/false
-<span id="L146" class="LineNr">146 </span>  50/push-EAX
-<span id="L147" class="LineNr">147 </span>    <span class="Comment"># call</span>
-<span id="L148" class="LineNr">148 </span>  e8/call  check_ints_equal/disp32
-<span id="L149" class="LineNr">149 </span>    <span class="Comment"># discard args</span>
-<span id="L150" class="LineNr">150 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L151" class="LineNr">151 </span>  c3/return
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span>test_compare_kernel_string_with_equal_array:
-<span id="L154" class="LineNr">154 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Abc&quot;)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># push args</span>
-<span id="L156" class="LineNr">156 </span>  68/push  &quot;Abc&quot;/imm32
-<span id="L157" class="LineNr">157 </span>  68/push  Abc_kernel_string/imm32
-<span id="L158" class="LineNr">158 </span>    <span class="Comment"># call</span>
-<span id="L159" class="LineNr">159 </span>  e8/call  kernel_string_equal/disp32
-<span id="L160" class="LineNr">160 </span>    <span class="Comment"># discard args</span>
-<span id="L161" class="LineNr">161 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment"># call check_ints_equal(EAX, 1, msg)</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># push args</span>
-<span id="L164" class="LineNr">164 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L165" class="LineNr">165 </span>  68/push  1/imm32/true
-<span id="L166" class="LineNr">166 </span>  50/push-EAX
-<span id="L167" class="LineNr">167 </span>    <span class="Comment"># call</span>
-<span id="L168" class="LineNr">168 </span>  e8/call  check_ints_equal/disp32
-<span id="L169" class="LineNr">169 </span>    <span class="Comment"># discard args</span>
-<span id="L170" class="LineNr">170 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L171" class="LineNr">171 </span>  c3/return
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span>test_compare_kernel_string_with_inequal_array:
-<span id="L174" class="LineNr">174 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Adc&quot;)</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># push args</span>
-<span id="L176" class="LineNr">176 </span>  68/push  &quot;Adc&quot;/imm32
-<span id="L177" class="LineNr">177 </span>  68/push  Abc_kernel_string/imm32
-<span id="L178" class="LineNr">178 </span>    <span class="Comment"># call</span>
-<span id="L179" class="LineNr">179 </span>  e8/call  kernel_string_equal/disp32
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># discard args</span>
-<span id="L181" class="LineNr">181 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Comment"># call check_ints_equal(EAX, 0, msg)</span>
-<span id="L183" class="LineNr">183 </span>    <span class="Comment"># push args</span>
-<span id="L184" class="LineNr">184 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L185" class="LineNr">185 </span>  68/push  0/imm32/false
-<span id="L186" class="LineNr">186 </span>  50/push-EAX
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># call</span>
-<span id="L188" class="LineNr">188 </span>  e8/call  check_ints_equal/disp32
-<span id="L189" class="LineNr">189 </span>    <span class="Comment"># discard args</span>
-<span id="L190" class="LineNr">190 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L191" class="LineNr">191 </span>  c3/return
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span>test_compare_kernel_string_with_empty_array:
-<span id="L194" class="LineNr">194 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;&quot;)</span>
-<span id="L195" class="LineNr">195 </span>    <span class="Comment"># push args</span>
-<span id="L196" class="LineNr">196 </span>  68/push  &quot;&quot;/imm32
-<span id="L197" class="LineNr">197 </span>  68/push  Abc_kernel_string/imm32
-<span id="L198" class="LineNr">198 </span>    <span class="Comment"># call</span>
-<span id="L199" class="LineNr">199 </span>  e8/call  kernel_string_equal/disp32
-<span id="L200" class="LineNr">200 </span>    <span class="Comment"># discard args</span>
-<span id="L201" class="LineNr">201 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Comment"># push args</span>
-<span id="L204" class="LineNr">204 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L205" class="LineNr">205 </span>  68/push  0/imm32/false
-<span id="L206" class="LineNr">206 </span>  50/push-EAX
-<span id="L207" class="LineNr">207 </span>    <span class="Comment"># call</span>
-<span id="L208" class="LineNr">208 </span>  e8/call  check_ints_equal/disp32
-<span id="L209" class="LineNr">209 </span>    <span class="Comment"># discard args</span>
-<span id="L210" class="LineNr">210 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L211" class="LineNr">211 </span>  c3/return
-<span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span>test_compare_kernel_string_with_shorter_array:
-<span id="L214" class="LineNr">214 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Ab&quot;)</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Comment"># push args</span>
-<span id="L216" class="LineNr">216 </span>  68/push  &quot;Ab&quot;/imm32
-<span id="L217" class="LineNr">217 </span>  68/push  Abc_kernel_string/imm32
-<span id="L218" class="LineNr">218 </span>    <span class="Comment"># call</span>
-<span id="L219" class="LineNr">219 </span>  e8/call  kernel_string_equal/disp32
-<span id="L220" class="LineNr">220 </span>    <span class="Comment"># discard args</span>
-<span id="L221" class="LineNr">221 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Comment"># push args</span>
-<span id="L224" class="LineNr">224 </span>  68/push  &quot;F - test_compare_kernel_string_with_shorter_array&quot;/imm32
-<span id="L225" class="LineNr">225 </span>  68/push  0/imm32/false
-<span id="L226" class="LineNr">226 </span>  50/push-EAX
-<span id="L227" class="LineNr">227 </span>    <span class="Comment"># call</span>
-<span id="L228" class="LineNr">228 </span>  e8/call  check_ints_equal/disp32
-<span id="L229" class="LineNr">229 </span>    <span class="Comment"># discard args</span>
-<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L231" class="LineNr">231 </span>  c3/return
-<span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span>test_compare_kernel_string_with_longer_array:
-<span id="L234" class="LineNr">234 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Abcd&quot;)</span>
-<span id="L235" class="LineNr">235 </span>    <span class="Comment"># push args</span>
-<span id="L236" class="LineNr">236 </span>  68/push  &quot;Abcd&quot;/imm32
-<span id="L237" class="LineNr">237 </span>  68/push  Abc_kernel_string/imm32
-<span id="L238" class="LineNr">238 </span>    <span class="Comment"># call</span>
-<span id="L239" class="LineNr">239 </span>  e8/call  kernel_string_equal/disp32
-<span id="L240" class="LineNr">240 </span>    <span class="Comment"># discard args</span>
-<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L243" class="LineNr">243 </span>    <span class="Comment"># push args</span>
-<span id="L244" class="LineNr">244 </span>  68/push  &quot;F - test_compare_kernel_string_with_longer_array&quot;/imm32
-<span id="L245" class="LineNr">245 </span>  68/push  0/imm32/false
-<span id="L246" class="LineNr">246 </span>  50/push-EAX
-<span id="L247" class="LineNr">247 </span>    <span class="Comment"># call</span>
-<span id="L248" class="LineNr">248 </span>  e8/call  check_ints_equal/disp32
-<span id="L249" class="LineNr">249 </span>    <span class="Comment"># discard args</span>
-<span id="L250" class="LineNr">250 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L251" class="LineNr">251 </span>  c3/return
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span>== data
+<span id="L113" class="LineNr">113 </span><span class="SalientComment">## tests</span>
+<span id="L114" class="LineNr">114 </span>
+<span id="L115" class="LineNr">115 </span>test-compare-null-kernel-string-with-empty-array:
+<span id="L116" class="LineNr">116 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
+<span id="L117" class="LineNr">117 </span>    <span class="Comment"># push args</span>
+<span id="L118" class="LineNr">118 </span>  68/push  &quot;&quot;/imm32
+<span id="L119" class="LineNr">119 </span>  68/push  Null-kernel-string/imm32
+<span id="L120" class="LineNr">120 </span>    <span class="Comment"># call</span>
+<span id="L121" class="LineNr">121 </span>  e8/call  kernel-string-equal/disp32
+<span id="L122" class="LineNr">122 </span>    <span class="Comment"># discard args</span>
+<span id="L123" class="LineNr">123 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L125" class="LineNr">125 </span>    <span class="Comment"># push args</span>
+<span id="L126" class="LineNr">126 </span>  68/push  &quot;F - test-compare-null-kernel-string-with-empty-array&quot;/imm32
+<span id="L127" class="LineNr">127 </span>  68/push  1/imm32/true
+<span id="L128" class="LineNr">128 </span>  50/push-EAX
+<span id="L129" class="LineNr">129 </span>    <span class="Comment"># call</span>
+<span id="L130" class="LineNr">130 </span>  e8/call  check-ints-equal/disp32
+<span id="L131" class="LineNr">131 </span>    <span class="Comment"># discard args</span>
+<span id="L132" class="LineNr">132 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L133" class="LineNr">133 </span>  c3/return
+<span id="L134" class="LineNr">134 </span>
+<span id="L135" class="LineNr">135 </span>test-compare-null-kernel-string-with-non-empty-array:
+<span id="L136" class="LineNr">136 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
+<span id="L137" class="LineNr">137 </span>    <span class="Comment"># push args</span>
+<span id="L138" class="LineNr">138 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L139" class="LineNr">139 </span>  68/push  Null-kernel-string/imm32
+<span id="L140" class="LineNr">140 </span>    <span class="Comment"># call</span>
+<span id="L141" class="LineNr">141 </span>  e8/call  kernel-string-equal/disp32
+<span id="L142" class="LineNr">142 </span>    <span class="Comment"># discard args</span>
+<span id="L143" class="LineNr">143 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L145" class="LineNr">145 </span>    <span class="Comment"># push args</span>
+<span id="L146" class="LineNr">146 </span>  68/push  &quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;/imm32
+<span id="L147" class="LineNr">147 </span>  68/push  0/imm32/false
+<span id="L148" class="LineNr">148 </span>  50/push-EAX
+<span id="L149" class="LineNr">149 </span>    <span class="Comment"># call</span>
+<span id="L150" class="LineNr">150 </span>  e8/call  check-ints-equal/disp32
+<span id="L151" class="LineNr">151 </span>    <span class="Comment"># discard args</span>
+<span id="L152" class="LineNr">152 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L153" class="LineNr">153 </span>  c3/return
+<span id="L154" class="LineNr">154 </span>
+<span id="L155" class="LineNr">155 </span>test-compare-kernel-string-with-equal-array:
+<span id="L156" class="LineNr">156 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
+<span id="L157" class="LineNr">157 </span>    <span class="Comment"># push args</span>
+<span id="L158" class="LineNr">158 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L159" class="LineNr">159 </span>  68/push  Abc-kernel-string/imm32
+<span id="L160" class="LineNr">160 </span>    <span class="Comment"># call</span>
+<span id="L161" class="LineNr">161 </span>  e8/call  kernel-string-equal/disp32
+<span id="L162" class="LineNr">162 </span>    <span class="Comment"># discard args</span>
+<span id="L163" class="LineNr">163 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L165" class="LineNr">165 </span>    <span class="Comment"># push args</span>
+<span id="L166" class="LineNr">166 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L167" class="LineNr">167 </span>  68/push  1/imm32/true
+<span id="L168" class="LineNr">168 </span>  50/push-EAX
+<span id="L169" class="LineNr">169 </span>    <span class="Comment"># call</span>
+<span id="L170" class="LineNr">170 </span>  e8/call  check-ints-equal/disp32
+<span id="L171" class="LineNr">171 </span>    <span class="Comment"># discard args</span>
+<span id="L172" class="LineNr">172 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L173" class="LineNr">173 </span>  c3/return
+<span id="L174" class="LineNr">174 </span>
+<span id="L175" class="LineNr">175 </span>test-compare-kernel-string-with-inequal-array:
+<span id="L176" class="LineNr">176 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
+<span id="L177" class="LineNr">177 </span>    <span class="Comment"># push args</span>
+<span id="L178" class="LineNr">178 </span>  68/push  &quot;Adc&quot;/imm32
+<span id="L179" class="LineNr">179 </span>  68/push  Abc-kernel-string/imm32
+<span id="L180" class="LineNr">180 </span>    <span class="Comment"># call</span>
+<span id="L181" class="LineNr">181 </span>  e8/call  kernel-string-equal/disp32
+<span id="L182" class="LineNr">182 </span>    <span class="Comment"># discard args</span>
+<span id="L183" class="LineNr">183 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L185" class="LineNr">185 </span>    <span class="Comment"># push args</span>
+<span id="L186" class="LineNr">186 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L187" class="LineNr">187 </span>  68/push  0/imm32/false
+<span id="L188" class="LineNr">188 </span>  50/push-EAX
+<span id="L189" class="LineNr">189 </span>    <span class="Comment"># call</span>
+<span id="L190" class="LineNr">190 </span>  e8/call  check-ints-equal/disp32
+<span id="L191" class="LineNr">191 </span>    <span class="Comment"># discard args</span>
+<span id="L192" class="LineNr">192 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L193" class="LineNr">193 </span>  c3/return
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span>test-compare-kernel-string-with-empty-array:
+<span id="L196" class="LineNr">196 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
+<span id="L197" class="LineNr">197 </span>    <span class="Comment"># push args</span>
+<span id="L198" class="LineNr">198 </span>  68/push  &quot;&quot;/imm32
+<span id="L199" class="LineNr">199 </span>  68/push  Abc-kernel-string/imm32
+<span id="L200" class="LineNr">200 </span>    <span class="Comment"># call</span>
+<span id="L201" class="LineNr">201 </span>  e8/call  kernel-string-equal/disp32
+<span id="L202" class="LineNr">202 </span>    <span class="Comment"># discard args</span>
+<span id="L203" class="LineNr">203 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L205" class="LineNr">205 </span>    <span class="Comment"># push args</span>
+<span id="L206" class="LineNr">206 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L207" class="LineNr">207 </span>  68/push  0/imm32/false
+<span id="L208" class="LineNr">208 </span>  50/push-EAX
+<span id="L209" class="LineNr">209 </span>    <span class="Comment"># call</span>
+<span id="L210" class="LineNr">210 </span>  e8/call  check-ints-equal/disp32
+<span id="L211" class="LineNr">211 </span>    <span class="Comment"># discard args</span>
+<span id="L212" class="LineNr">212 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L213" class="LineNr">213 </span>  c3/return
+<span id="L214" class="LineNr">214 </span>
+<span id="L215" class="LineNr">215 </span>test-compare-kernel-string-with-shorter-array:
+<span id="L216" class="LineNr">216 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
+<span id="L217" class="LineNr">217 </span>    <span class="Comment"># push args</span>
+<span id="L218" class="LineNr">218 </span>  68/push  &quot;Ab&quot;/imm32
+<span id="L219" class="LineNr">219 </span>  68/push  Abc-kernel-string/imm32
+<span id="L220" class="LineNr">220 </span>    <span class="Comment"># call</span>
+<span id="L221" class="LineNr">221 </span>  e8/call  kernel-string-equal/disp32
+<span id="L222" class="LineNr">222 </span>    <span class="Comment"># discard args</span>
+<span id="L223" class="LineNr">223 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L225" class="LineNr">225 </span>    <span class="Comment"># push args</span>
+<span id="L226" class="LineNr">226 </span>  68/push  &quot;F - test-compare-kernel-string-with-shorter-array&quot;/imm32
+<span id="L227" class="LineNr">227 </span>  68/push  0/imm32/false
+<span id="L228" class="LineNr">228 </span>  50/push-EAX
+<span id="L229" class="LineNr">229 </span>    <span class="Comment"># call</span>
+<span id="L230" class="LineNr">230 </span>  e8/call  check-ints-equal/disp32
+<span id="L231" class="LineNr">231 </span>    <span class="Comment"># discard args</span>
+<span id="L232" class="LineNr">232 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L233" class="LineNr">233 </span>  c3/return
+<span id="L234" class="LineNr">234 </span>
+<span id="L235" class="LineNr">235 </span>test-compare-kernel-string-with-longer-array:
+<span id="L236" class="LineNr">236 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
+<span id="L237" class="LineNr">237 </span>    <span class="Comment"># push args</span>
+<span id="L238" class="LineNr">238 </span>  68/push  &quot;Abcd&quot;/imm32
+<span id="L239" class="LineNr">239 </span>  68/push  Abc-kernel-string/imm32
+<span id="L240" class="LineNr">240 </span>    <span class="Comment"># call</span>
+<span id="L241" class="LineNr">241 </span>  e8/call  kernel-string-equal/disp32
+<span id="L242" class="LineNr">242 </span>    <span class="Comment"># discard args</span>
+<span id="L243" class="LineNr">243 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L245" class="LineNr">245 </span>    <span class="Comment"># push args</span>
+<span id="L246" class="LineNr">246 </span>  68/push  &quot;F - test-compare-kernel-string-with-longer-array&quot;/imm32
+<span id="L247" class="LineNr">247 </span>  68/push  0/imm32/false
+<span id="L248" class="LineNr">248 </span>  50/push-EAX
+<span id="L249" class="LineNr">249 </span>    <span class="Comment"># call</span>
+<span id="L250" class="LineNr">250 </span>  e8/call  check-ints-equal/disp32
+<span id="L251" class="LineNr">251 </span>    <span class="Comment"># discard args</span>
+<span id="L252" class="LineNr">252 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L253" class="LineNr">253 </span>  c3/return
 <span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span>Null_kernel_string:
-<span id="L256" class="LineNr">256 </span>  00/null
-<span id="L257" class="LineNr">257 </span>Abc_kernel_string:
-<span id="L258" class="LineNr">258 </span>  41/A 62/b 63/c 00/null
-<span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L255" class="LineNr">255 </span>== data
+<span id="L256" class="LineNr">256 </span>
+<span id="L257" class="LineNr">257 </span>Null-kernel-string:
+<span id="L258" class="LineNr">258 </span>  00/null
+<span id="L259" class="LineNr">259 </span>Abc-kernel-string:
+<span id="L260" class="LineNr">260 </span>  41/A 62/b 63/c 00/null
+<span id="L261" class="LineNr">261 </span>
+<span id="L262" class="LineNr">262 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/053new_segment.subx.html b/html/subx/053new_segment.subx.html
index 49724d37..af0bd778 100644
--- a/html/subx/053new_segment.subx.html
+++ b/html/subx/053new_segment.subx.html
@@ -62,11 +62,11 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </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="L8" class="LineNr"> 8 </span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
-<span id="L10" class="LineNr">10 </span>  <span class="Comment"># EAX = new_segment(0x1000)</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Comment"># EAX = new-segment(0x1000)</span>
 <span id="L11" class="LineNr">11 </span>    <span class="Comment"># push arg</span>
 <span id="L12" class="LineNr">12 </span>  68/push  0x1000/imm32
 <span id="L13" class="LineNr">13 </span>    <span class="Comment"># call</span>
-<span id="L14" class="LineNr">14 </span>  e8/call  new_segment/disp32
+<span id="L14" class="LineNr">14 </span>  e8/call  new-segment/disp32
 <span id="L15" class="LineNr">15 </span>    <span class="Comment"># discard arg</span>
 <span id="L16" class="LineNr">16 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32                 <span class="Comment"># add to ESP</span>
 <span id="L17" class="LineNr">17 </span>
@@ -75,22 +75,22 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span>
 <span id="L21" class="LineNr">21 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L22" class="LineNr">22 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
-<span id="L23" class="LineNr">23 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy to EAX</span>
+<span id="L23" class="LineNr">23 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L24" class="LineNr">24 </span>  cd/syscall  0x80/imm8
 <span id="L25" class="LineNr">25 </span>
-<span id="L26" class="LineNr">26 </span>new_segment:  <span class="Comment"># len : int -&gt; address</span>
+<span id="L26" class="LineNr">26 </span>new-segment:  <span class="Comment"># len : int -&gt; address</span>
 <span id="L27" class="LineNr">27 </span>  <span class="Comment"># 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="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy ESP to EBP</span>
 <span id="L30" class="LineNr">30 </span>  53/push-EBX
-<span id="L31" class="LineNr">31 </span>  <span class="Comment"># copy len to mmap_new_segment.len</span>
-<span id="L32" class="LineNr">32 </span>  <span class="Comment"># TODO: compute mmap_new_segment+4 before runtime</span>
-<span id="L33" class="LineNr">33 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L34" class="LineNr">34 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              mmap_new_segment/imm32  <span class="Comment"># copy to EBX</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Comment"># copy len to mmap-new-segment.len</span>
+<span id="L32" class="LineNr">32 </span>  <span class="Comment"># TODO: compute mmap-new-segment+4 before runtime</span>
+<span id="L33" class="LineNr">33 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L34" class="LineNr">34 </span>  bb/copy-to-EBX  mmap-new-segment/imm32
 <span id="L35" class="LineNr">35 </span>  89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *(EBX+4)</span>
-<span id="L36" class="LineNr">36 </span>  <span class="Comment"># mmap(mmap_new_segment)</span>
-<span id="L37" class="LineNr">37 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              mmap_new_segment/imm32  <span class="Comment"># copy to EBX</span>
-<span id="L38" class="LineNr">38 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x5a/imm32/mmap         <span class="Comment"># copy to EAX</span>
+<span id="L36" class="LineNr">36 </span>  <span class="Comment"># mmap(mmap-new-segment)</span>
+<span id="L37" class="LineNr">37 </span>  bb/copy-to-EBX  mmap-new-segment/imm32
+<span id="L38" class="LineNr">38 </span>  b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L39" class="LineNr">39 </span>  cd/syscall  0x80/imm8
 <span id="L40" class="LineNr">40 </span>  <span class="Comment"># epilog</span>
 <span id="L41" class="LineNr">41 </span>  5b/pop-to-EBX
@@ -100,7 +100,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr">45 </span>
 <span id="L46" class="LineNr">46 </span>== data
 <span id="L47" class="LineNr">47 </span><span class="Comment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L48" class="LineNr">48 </span>mmap_new_segment:  <span class="Comment"># type mmap_arg_struct</span>
+<span id="L48" class="LineNr">48 </span>mmap-new-segment:  <span class="Comment"># type mmap_arg_struct</span>
 <span id="L49" class="LineNr">49 </span>  <span class="Comment"># addr</span>
 <span id="L50" class="LineNr">50 </span>  00 00 00 00  <span class="Comment"># null</span>
 <span id="L51" class="LineNr">51 </span>  <span class="Comment"># len</span>
@@ -114,7 +114,7 @@ if ('onhashchange' in window) {
 <span id="L59" class="LineNr">59 </span>  <span class="Comment"># offset</span>
 <span id="L60" class="LineNr">60 </span>  00 00 00 00  <span class="Comment"># 0 since MAP_ANONYMOUS is specified</span>
 <span id="L61" class="LineNr">61 </span>
-<span id="L62" class="LineNr">62 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L62" class="LineNr">62 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/054string_equal.subx.html b/html/subx/054string_equal.subx.html
new file mode 100644
index 00000000..044da332
--- /dev/null
+++ b/html/subx/054string_equal.subx.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/054string_equal.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment"># Comparing 'regular' length-prefixed strings.</span>
+<span id="L2" class="LineNr">  2 </span>
+<span id="L3" class="LineNr">  3 </span>== code
+<span id="L4" class="LineNr">  4 </span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L7" class="LineNr">  7 </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="L8" class="LineNr">  8 </span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L10" class="LineNr"> 10 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L11" class="LineNr"> 11 </span>  <span class="Comment"># exit(Num-test-failures)</span>
+<span id="L12" class="LineNr"> 12 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   Num-test-failures/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L13" class="LineNr"> 13 </span>  b8/copy-to-EAX  1/imm32
+<span id="L14" class="LineNr"> 14 </span>  cd/syscall  0x80/imm8
+<span id="L15" class="LineNr"> 15 </span>
+<span id="L16" class="LineNr"> 16 </span>string-equal:  <span class="Comment"># s : string, benchmark : string -&gt; EAX : boolean</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="Comment"># prolog</span>
+<span id="L18" class="LineNr"> 18 </span>  55/push-EBP
+<span id="L19" class="LineNr"> 19 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="Comment"># save registers</span>
+<span id="L21" class="LineNr"> 21 </span>  51/push-ECX
+<span id="L22" class="LineNr"> 22 </span>  52/push-EDX
+<span id="L23" class="LineNr"> 23 </span>  53/push-EBX
+<span id="L24" class="LineNr"> 24 </span>  56/push-ESI
+<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># pseudocode:</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="Comment">#   if s.length != b.length return false</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Comment">#   for i = 0;  i &lt; s.length;  ++i</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Comment">#     if s[i] != b[i] return false</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Comment">#   return true</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Comment"># registers:</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Comment">#   i: ECX</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="Comment">#   s.length: EDX</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="Comment">#   b.length: EBX</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Comment">#   b[i]: EBX</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="Comment">#   s[i]: EAX</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Comment">#</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Comment"># var s/EAX : (address array byte)</span>
+<span id="L38" class="LineNr"> 38 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># var benchmark/EBX : (address array byte)</span>
+<span id="L40" class="LineNr"> 40 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
+<span id="L41" class="LineNr"> 41 </span>  <span class="Comment"># if s.length != b.length return false</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="Comment"># EDX = s.length</span>
+<span id="L43" class="LineNr"> 43 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to EDX</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># compare s.length and b.length</span>
+<span id="L45" class="LineNr"> 45 </span>  39/compare                      0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare *EBX with EDX</span>
+<span id="L46" class="LineNr"> 46 </span>  75/jump-if-not-equal  $string-equal:false/disp8
+<span id="L47" class="LineNr"> 47 </span>$string-equal:lengths:
+<span id="L48" class="LineNr"> 48 </span>  <span class="Comment"># var i/ECX : int = 0</span>
+<span id="L49" class="LineNr"> 49 </span>  b9/copy-to-ECX  0/imm32
+<span id="L50" class="LineNr"> 50 </span>  <span class="Comment"># EBX = &amp;b[i]</span>
+<span id="L51" class="LineNr"> 51 </span>  43/inc-EBX
+<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># EAX = &amp;s[i]</span>
+<span id="L53" class="LineNr"> 53 </span>  40/inc-EAX
+<span id="L54" class="LineNr"> 54 </span>$string-equal:loop:
+<span id="L55" class="LineNr"> 55 </span>  <span class="Comment"># if i &gt;= s.length return true</span>
+<span id="L56" class="LineNr"> 56 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
+<span id="L57" class="LineNr"> 57 </span>  7d/jump-if-greater-or-equal  $string-equal:true/disp8
+<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># if b[i] != s[i] return false</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="Comment"># ESI = s[i]</span>
+<span id="L60" class="LineNr"> 60 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to ESI</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># compare b[i] with ESI</span>
+<span id="L62" class="LineNr"> 62 </span>  39/compare                      0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare *EBX with ESI</span>
+<span id="L63" class="LineNr"> 63 </span>  75/jump-if-not-equal  $string-equal:false/disp8
+<span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># ++i</span>
+<span id="L65" class="LineNr"> 65 </span>  41/inc-ECX
+<span id="L66" class="LineNr"> 66 </span>  40/inc-EAX
+<span id="L67" class="LineNr"> 67 </span>  43/inc-EBX
+<span id="L68" class="LineNr"> 68 </span>  <span class="Comment"># loop</span>
+<span id="L69" class="LineNr"> 69 </span>  eb/jump  $string-equal:loop/disp8
+<span id="L70" class="LineNr"> 70 </span>$string-equal:true:
+<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># return true</span>
+<span id="L72" class="LineNr"> 72 </span>  b8/copy-to-EAX  1/imm32
+<span id="L73" class="LineNr"> 73 </span>  eb/jump  $string-equal:end/disp8
+<span id="L74" class="LineNr"> 74 </span>$string-equal:false:
+<span id="L75" class="LineNr"> 75 </span>  <span class="Comment"># return false</span>
+<span id="L76" class="LineNr"> 76 </span>  b8/copy-to-EAX  0/imm32
+<span id="L77" class="LineNr"> 77 </span>$string-equal:end:
+<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># restore registers</span>
+<span id="L79" class="LineNr"> 79 </span>  5e/pop-to-ESI
+<span id="L80" class="LineNr"> 80 </span>  5b/pop-to-EBX
+<span id="L81" class="LineNr"> 81 </span>  5a/pop-to-EDX
+<span id="L82" class="LineNr"> 82 </span>  59/pop-to-ECX
+<span id="L83" class="LineNr"> 83 </span>  <span class="Comment"># epilog</span>
+<span id="L84" class="LineNr"> 84 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L85" class="LineNr"> 85 </span>  5d/pop-to-EBP
+<span id="L86" class="LineNr"> 86 </span>  c3/return
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><span class="SalientComment">## tests</span>
+<span id="L89" class="LineNr"> 89 </span>
+<span id="L90" class="LineNr"> 90 </span>test-compare-empty-with-empty-string:
+<span id="L91" class="LineNr"> 91 </span>  <span class="Comment"># EAX = string-equal(&quot;&quot;, &quot;&quot;)</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># push args</span>
+<span id="L93" class="LineNr"> 93 </span>  68/push  &quot;&quot;/imm32
+<span id="L94" class="LineNr"> 94 </span>  68/push  &quot;&quot;/imm32
+<span id="L95" class="LineNr"> 95 </span>    <span class="Comment"># call</span>
+<span id="L96" class="LineNr"> 96 </span>  e8/call  string-equal/disp32
+<span id="L97" class="LineNr"> 97 </span>    <span class="Comment"># discard args</span>
+<span id="L98" class="LineNr"> 98 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L100" class="LineNr">100 </span>    <span class="Comment"># push args</span>
+<span id="L101" class="LineNr">101 </span>  68/push  &quot;F - test-compare-empty-with-empty-string&quot;/imm32
+<span id="L102" class="LineNr">102 </span>  68/push  1/imm32/true
+<span id="L103" class="LineNr">103 </span>  50/push-EAX
+<span id="L104" class="LineNr">104 </span>    <span class="Comment"># call</span>
+<span id="L105" class="LineNr">105 </span>  e8/call  check-ints-equal/disp32
+<span id="L106" class="LineNr">106 </span>    <span class="Comment"># discard args</span>
+<span id="L107" class="LineNr">107 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L108" class="LineNr">108 </span>  c3/return
+<span id="L109" class="LineNr">109 </span>
+<span id="L110" class="LineNr">110 </span>test-compare-empty-with-non-empty-string:  <span class="Comment"># also checks length-mismatch code path</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Comment"># EAX = string-equal(&quot;&quot;, &quot;Abc&quot;)</span>
+<span id="L112" class="LineNr">112 </span>    <span class="Comment"># push args</span>
+<span id="L113" class="LineNr">113 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L114" class="LineNr">114 </span>  68/push  &quot;&quot;/imm32
+<span id="L115" class="LineNr">115 </span>    <span class="Comment"># call</span>
+<span id="L116" class="LineNr">116 </span>  e8/call  string-equal/disp32
+<span id="L117" class="LineNr">117 </span>    <span class="Comment"># discard args</span>
+<span id="L118" class="LineNr">118 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L120" class="LineNr">120 </span>    <span class="Comment"># push args</span>
+<span id="L121" class="LineNr">121 </span>  68/push  &quot;F - test-compare-empty-with-non-empty-string&quot;/imm32
+<span id="L122" class="LineNr">122 </span>  68/push  0/imm32/false
+<span id="L123" class="LineNr">123 </span>  50/push-EAX
+<span id="L124" class="LineNr">124 </span>    <span class="Comment"># call</span>
+<span id="L125" class="LineNr">125 </span>  e8/call  check-ints-equal/disp32
+<span id="L126" class="LineNr">126 </span>    <span class="Comment"># discard args</span>
+<span id="L127" class="LineNr">127 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L128" class="LineNr">128 </span>  c3/return
+<span id="L129" class="LineNr">129 </span>
+<span id="L130" class="LineNr">130 </span>test-compare-equal-strings:
+<span id="L131" class="LineNr">131 </span>  <span class="Comment"># EAX = string-equal(&quot;Abc&quot;, &quot;Abc&quot;)</span>
+<span id="L132" class="LineNr">132 </span>    <span class="Comment"># push args</span>
+<span id="L133" class="LineNr">133 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L134" class="LineNr">134 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L135" class="LineNr">135 </span>    <span class="Comment"># call</span>
+<span id="L136" class="LineNr">136 </span>  e8/call  string-equal/disp32
+<span id="L137" class="LineNr">137 </span>    <span class="Comment"># discard args</span>
+<span id="L138" class="LineNr">138 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L140" class="LineNr">140 </span>    <span class="Comment"># push args</span>
+<span id="L141" class="LineNr">141 </span>  68/push  &quot;F - test-compare-equal-strings&quot;/imm32
+<span id="L142" class="LineNr">142 </span>  68/push  1/imm32/true
+<span id="L143" class="LineNr">143 </span>  50/push-EAX
+<span id="L144" class="LineNr">144 </span>    <span class="Comment"># call</span>
+<span id="L145" class="LineNr">145 </span>  e8/call  check-ints-equal/disp32
+<span id="L146" class="LineNr">146 </span>    <span class="Comment"># discard args</span>
+<span id="L147" class="LineNr">147 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L148" class="LineNr">148 </span>  c3/return
+<span id="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span>test-compare-inequal-strings-equal-lengths:
+<span id="L151" class="LineNr">151 </span>  <span class="Comment"># EAX = string-equal(&quot;Abc&quot;, &quot;Adc&quot;)</span>
+<span id="L152" class="LineNr">152 </span>    <span class="Comment"># push args</span>
+<span id="L153" class="LineNr">153 </span>  68/push  &quot;Adc&quot;/imm32
+<span id="L154" class="LineNr">154 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L155" class="LineNr">155 </span>    <span class="Comment"># call</span>
+<span id="L156" class="LineNr">156 </span>  e8/call  string-equal/disp32
+<span id="L157" class="LineNr">157 </span>    <span class="Comment"># discard args</span>
+<span id="L158" class="LineNr">158 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L160" class="LineNr">160 </span>    <span class="Comment"># push args</span>
+<span id="L161" class="LineNr">161 </span>  68/push  &quot;F - test-compare-inequal-strings-equal-lengths&quot;/imm32
+<span id="L162" class="LineNr">162 </span>  68/push  0/imm32/false
+<span id="L163" class="LineNr">163 </span>  50/push-EAX
+<span id="L164" class="LineNr">164 </span>    <span class="Comment"># call</span>
+<span id="L165" class="LineNr">165 </span>  e8/call  check-ints-equal/disp32
+<span id="L166" class="LineNr">166 </span>    <span class="Comment"># discard args</span>
+<span id="L167" class="LineNr">167 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L168" class="LineNr">168 </span>  c3/return
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/055trace.subx.html b/html/subx/055trace.subx.html
new file mode 100644
index 00000000..16a7af2f
--- /dev/null
+++ b/html/subx/055trace.subx.html
@@ -0,0 +1,373 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/055trace.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment"># helpers for emitting traces to a trace stream, and for tests to check the trace stream</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment"># A trace stream looks like this:</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">#   read : int  # index that we've read until</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">#   write : int  # index at which writes go</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">#   data : (array byte)  # prefixed by length as usual</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment"># In a real trace the data will be in a special segment set aside for the purpose.</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">#</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment"># primitives for operating on traces:</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   - initialize-trace-stream (update global variable)</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   - trace: stream, string</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">#   - die: stream (exit(1) if using real trace)</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment">#   - check-trace-contains: stream, string/line, string/message (scans only from stream's read pointer, prints message to stderr on failure, updates stream's read pointer)</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   - rewind-reads: stream (resets read pointer)</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   - scan-to-next-line: stream (advance read pointer past next newline)</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">#</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment"># Traces are very fundamental, so many of the helpers we create here won't be</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment"># used elsewhere; we'll switch to more bounds-checked variants. But here we get</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment"># bounds-checking for free; we allocate a completely disjoint segment for trace</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment"># data, and overflowing it will generate a page fault.</span>
+<span id="L21" class="LineNr"> 21 </span>
+<span id="L22" class="LineNr"> 22 </span>== data
+<span id="L23" class="LineNr"> 23 </span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment"># We'll save the address of the trace segment here.</span>
+<span id="L25" class="LineNr"> 25 </span>Trace-stream:
+<span id="L26" class="LineNr"> 26 </span>  00 00 00 00
+<span id="L27" class="LineNr"> 27 </span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment"># Fake trace-stream for tests.</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment"># Also illustrates the layout of the real trace-stream (segment).</span>
+<span id="L30" class="LineNr"> 30 </span>Test-trace-stream:
+<span id="L31" class="LineNr"> 31 </span>  <span class="Comment"># current write index</span>
+<span id="L32" class="LineNr"> 32 </span>  00 00 00 00
+<span id="L33" class="LineNr"> 33 </span>  <span class="Comment"># current read index</span>
+<span id="L34" class="LineNr"> 34 </span>  00 00 00 00
+<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L36" class="LineNr"> 36 </span>  08 00 00 00
+<span id="L37" class="LineNr"> 37 </span>  <span class="Comment"># data</span>
+<span id="L38" class="LineNr"> 38 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L39" class="LineNr"> 39 </span>
+<span id="L40" class="LineNr"> 40 </span>== code
+<span id="L41" class="LineNr"> 41 </span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L44" class="LineNr"> 44 </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="L45" class="LineNr"> 45 </span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L47" class="LineNr"> 47 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
+<span id="L49" class="LineNr"> 49 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/EBX   Num-test-failures/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L50" class="LineNr"> 50 </span>  b8/copy-to-EAX  1/imm32
+<span id="L51" class="LineNr"> 51 </span>  cd/syscall  0x80/imm8
+<span id="L52" class="LineNr"> 52 </span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment"># Allocate a new segment for the trace stream, initialize its length, and save its address to Trace-stream.</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment"># The Trace-stream segment will consist of variable-length lines separated by newlines (0x0a)</span>
+<span id="L55" class="LineNr"> 55 </span>initialize-trace-stream:
+<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># EAX = new-segment(0x1000)</span>
+<span id="L57" class="LineNr"> 57 </span>    <span class="Comment"># push arg</span>
+<span id="L58" class="LineNr"> 58 </span>  68/push  0x1000/imm32/N
+<span id="L59" class="LineNr"> 59 </span>    <span class="Comment"># call</span>
+<span id="L60" class="LineNr"> 60 </span>  e8/call  new-segment/disp32
+<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># discard arg</span>
+<span id="L62" class="LineNr"> 62 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># copy EAX to *Trace-stream</span>
+<span id="L64" class="LineNr"> 64 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   Trace-stream/disp32               <span class="Comment"># copy EAX to *Trace-stream</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># Trace-stream.length = 0x1000/N - 12</span>
+<span id="L66" class="LineNr"> 66 </span>  c7          0/copy              1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         0xff4/imm32       <span class="Comment"># copy 0xff4 to *(EAX+8)</span>
+<span id="L67" class="LineNr"> 67 </span>  c3/return
+<span id="L68" class="LineNr"> 68 </span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment"># Append to the given trace stream.</span>
+<span id="L70" class="LineNr"> 70 </span>trace:  <span class="Comment"># t : (address trace-stream), line : string</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># prolog</span>
+<span id="L72" class="LineNr"> 72 </span>  55/push-EBP
+<span id="L73" class="LineNr"> 73 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># save registers</span>
+<span id="L75" class="LineNr"> 75 </span>  50/push-EAX
+<span id="L76" class="LineNr"> 76 </span>  51/push-ECX
+<span id="L77" class="LineNr"> 77 </span>  52/push-EDX
+<span id="L78" class="LineNr"> 78 </span>  53/push-EBX
+<span id="L79" class="LineNr"> 79 </span>  56/push-ESI
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># EAX = t</span>
+<span id="L81" class="LineNr"> 81 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment"># EBX = line</span>
+<span id="L83" class="LineNr"> 83 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Comment"># append line to t.data from t.write</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">#</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># pseudocode:</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Comment">#   destend = &amp;t.data[t.length]</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Comment">#   oldw = t.write</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Comment">#   if line.length == 0 return</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Comment">#   t.write += line.length + 1  # for newline</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Comment">#   dest = &amp;t.data[oldw]</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Comment">#   srcend = &amp;line.data[line.length]</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Comment">#   src = &amp;line.data[0]</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Comment">#   while true:</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Comment">#     if src &gt;= srcend break</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">#     if dest &gt;= destend break  # for now silently ignore filled up trace buffer</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">#     *dest = *src</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">#     ++src</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Comment">#     ++dest</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Comment">#   if dest &gt;= destend return</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment">#   *dest = 10/newline</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Comment">#</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Comment"># key registers to set up for the loop:</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Comment">#   EAX/dest, ECX/destend, EBX/src, ESI/srcend</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Comment"># we save EDX for byte operations (has to be one of the first 4 registers)</span>
+<span id="L106" class="LineNr">106 </span>  <span class="Comment">#</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Comment"># register setup before the loop:</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Comment">#   EAX = *(EBP+8)    # t</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Comment">#   EBX = *(EBP+12)   # line</span>
+<span id="L110" class="LineNr">110 </span>  <span class="Comment">#   ECX = *(EAX+8)    # t.length</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Comment">#   ECX = EAX+12+ECX  # destend = &amp;t.data[t.length]</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Comment">#   ESI = *EAX        # oldw = t.write</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Comment">#   EDX = *EBX        # line.length</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Comment">#   *EAX = *EAX + EDX # update t.write  (allowed to go past t.length)</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Comment">#                     # do this here just because it's convenient</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Comment">#   ++ *EAX  # for the newline</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Comment">#   EAX = EAX+12+ESI  # dest = &amp;t.data[oldw]</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Comment">#   ESI = EBX+4+EDX   # srcend = &amp;line.data[line.length]</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Comment">#   EBX = EBX+4       # src = &amp;line.data[0]</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment">#</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Comment"># EAX/t and EBX/line are already initialized</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment"># ECX = t.length</span>
+<span id="L123" class="LineNr">123 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EAX+8) to ECX</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Comment"># ECX/destend = &amp;t.data[t.length]</span>
+<span id="L125" class="LineNr">125 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+12 to ECX</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Comment"># ESI/oldw = t.write</span>
+<span id="L127" class="LineNr">127 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to ESI</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Comment"># EDX = line.length</span>
+<span id="L129" class="LineNr">129 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EBX to EDX</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Comment"># if EDX == 0 return</span>
+<span id="L131" class="LineNr">131 </span>  81          7/subop/compare     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EDX</span>
+<span id="L132" class="LineNr">132 </span>  74/jump-if-equal  $trace:end/disp8
+<span id="L133" class="LineNr">133 </span>  <span class="Comment"># t.write += line.length</span>
+<span id="L134" class="LineNr">134 </span>  01/add                          0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EDX to *EAX</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Comment"># t.write++ (for the newline we'll append below)</span>
+<span id="L136" class="LineNr">136 </span>  81          0/subop/add         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># add to *EAX</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Comment"># EAX/dest = &amp;t.data[oldw]</span>
+<span id="L138" class="LineNr">138 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  6/index/ESI  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ESI+12 to EAX</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Comment"># ESI/srcend = &amp;line.data[line.length]</span>
+<span id="L140" class="LineNr">140 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    3/base/EBX  2/index/EDX  <span class="Delimiter"> . </span>          6/r32/ESI   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EBX+EDX+4 to ESI</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Comment"># EBX/src = &amp;line.data[0]</span>
+<span id="L142" class="LineNr">142 </span>  81          0/subop/add         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to EBX</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Comment"># while (true)</span>
+<span id="L144" class="LineNr">144 </span>$trace:loop:
+<span id="L145" class="LineNr">145 </span>  <span class="Comment"># if EBX/src &gt;= ESI/srcend break</span>
+<span id="L146" class="LineNr">146 </span>  39/compare                      3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EBX with ESI</span>
+<span id="L147" class="LineNr">147 </span>  7d/jump-if-greater-or-equal  $trace:break/disp8
+<span id="L148" class="LineNr">148 </span>  <span class="Comment"># if EAX/dest &gt;= ECX/destend break  (for now silently ignore filled up trace buffer)</span>
+<span id="L149" class="LineNr">149 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L150" class="LineNr">150 </span>  7d/jump-if-greater-or-equal  $trace:break/disp8
+<span id="L151" class="LineNr">151 </span>  <span class="Comment"># copy one byte</span>
+<span id="L152" class="LineNr">152 </span>  8a/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/DL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EBX to DL</span>
+<span id="L153" class="LineNr">153 </span>  88/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/DL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at DL to *EAX</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Comment"># updates</span>
+<span id="L155" class="LineNr">155 </span>  40/increment-EAX
+<span id="L156" class="LineNr">156 </span>  43/increment-EBX
+<span id="L157" class="LineNr">157 </span>  eb/jump  $trace:loop/disp8
+<span id="L158" class="LineNr">158 </span>$trace:break:
+<span id="L159" class="LineNr">159 </span>  <span class="Comment"># finally, append a newline</span>
+<span id="L160" class="LineNr">160 </span>    <span class="Comment"># if EAX/dest &gt;= ECX/destend return</span>
+<span id="L161" class="LineNr">161 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L162" class="LineNr">162 </span>  7d/jump-if-greater-or-equal  $trace:end/disp8
+<span id="L163" class="LineNr">163 </span>    <span class="Comment"># append</span>
+<span id="L164" class="LineNr">164 </span>  ba/copy-to-EDX  0x0a/imm32
+<span id="L165" class="LineNr">165 </span>  88/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/DL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at DL to *EAX</span>
+<span id="L166" class="LineNr">166 </span>$trace:end:
+<span id="L167" class="LineNr">167 </span>  <span class="Comment"># restore registers</span>
+<span id="L168" class="LineNr">168 </span>  5e/pop-to-ESI
+<span id="L169" class="LineNr">169 </span>  5b/pop-to-EBX
+<span id="L170" class="LineNr">170 </span>  5a/pop-to-EDX
+<span id="L171" class="LineNr">171 </span>  59/pop-to-ECX
+<span id="L172" class="LineNr">172 </span>  58/pop-to-EAX
+<span id="L173" class="LineNr">173 </span>  <span class="Comment"># epilog</span>
+<span id="L174" class="LineNr">174 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L175" class="LineNr">175 </span>  5d/pop-to-EBP
+<span id="L176" class="LineNr">176 </span>  c3/return
+<span id="L177" class="LineNr">177 </span>
+<span id="L178" class="LineNr">178 </span>clear-trace-stream:  <span class="Comment"># t : (address trace-stream)</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Comment"># prolog</span>
+<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="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Comment"># save registers</span>
+<span id="L183" class="LineNr">183 </span>  50/push-EAX
+<span id="L184" class="LineNr">184 </span>  51/push-ECX
+<span id="L185" class="LineNr">185 </span>  <span class="Comment"># EAX = t</span>
+<span id="L186" class="LineNr">186 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Comment"># ECX = t.length</span>
+<span id="L188" class="LineNr">188 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EAX+8) to ECX</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Comment"># ECX = &amp;t.data[t.length]</span>
+<span id="L190" class="LineNr">190 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+12 to ECX</span>
+<span id="L191" class="LineNr">191 </span>  <span class="Comment"># t.write = 0</span>
+<span id="L192" class="LineNr">192 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Comment"># t.read = 0</span>
+<span id="L194" class="LineNr">194 </span>  c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         0/imm32           <span class="Comment"># copy to *(EAX+4)</span>
+<span id="L195" class="LineNr">195 </span>  <span class="Comment"># EAX = t.data</span>
+<span id="L196" class="LineNr">196 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to EAX</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Comment"># while (true)</span>
+<span id="L198" class="LineNr">198 </span>$clear-trace-stream:loop:
+<span id="L199" class="LineNr">199 </span>  <span class="Comment"># if EAX &gt;= ECX break</span>
+<span id="L200" class="LineNr">200 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L201" class="LineNr">201 </span>  7d/jump-if-greater-or-equal  $clear-trace-stream:end/disp8
+<span id="L202" class="LineNr">202 </span>  <span class="Comment"># *EAX = 0</span>
+<span id="L203" class="LineNr">203 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Comment"># EAX += 4</span>
+<span id="L205" class="LineNr">205 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to EAX</span>
+<span id="L206" class="LineNr">206 </span>  eb/jump  $clear-trace-stream:loop/disp8
+<span id="L207" class="LineNr">207 </span>$clear-trace-stream:end:
+<span id="L208" class="LineNr">208 </span>  <span class="Comment"># restore registers</span>
+<span id="L209" class="LineNr">209 </span>  59/pop-to-ECX
+<span id="L210" class="LineNr">210 </span>  58/pop-to-EAX
+<span id="L211" class="LineNr">211 </span>  <span class="Comment"># epilog</span>
+<span id="L212" class="LineNr">212 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L213" class="LineNr">213 </span>  5d/pop-to-EBP
+<span id="L214" class="LineNr">214 </span>  c3/return
+<span id="L215" class="LineNr">215 </span>
+<span id="L216" class="LineNr">216 </span>test-trace-single:
+<span id="L217" class="LineNr">217 </span>  <span class="Comment"># clear-trace-stream(Test-trace-stream)</span>
+<span id="L218" class="LineNr">218 </span>    <span class="Comment"># push args</span>
+<span id="L219" class="LineNr">219 </span>  68/push  Test-trace-stream/imm32
+<span id="L220" class="LineNr">220 </span>    <span class="Comment"># call</span>
+<span id="L221" class="LineNr">221 </span>  e8/call  clear-trace-stream/disp32
+<span id="L222" class="LineNr">222 </span>    <span class="Comment"># discard args</span>
+<span id="L223" class="LineNr">223 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Comment"># trace(Test-trace-stream, &quot;Ab&quot;)</span>
+<span id="L225" class="LineNr">225 </span>    <span class="Comment"># push args</span>
+<span id="L226" class="LineNr">226 </span>  68/push  &quot;Ab&quot;/imm32
+<span id="L227" class="LineNr">227 </span>  68/push  Test-trace-stream/imm32
+<span id="L228" class="LineNr">228 </span>    <span class="Comment"># call</span>
+<span id="L229" class="LineNr">229 </span>  e8/call  trace/disp32
+<span id="L230" class="LineNr">230 </span>    <span class="Comment"># discard args</span>
+<span id="L231" class="LineNr">231 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Comment"># check-ints-equal(*Test-trace-stream.data, 41/A 62/b 0a/newline 00, msg)</span>
+<span id="L233" class="LineNr">233 </span>    <span class="Comment"># push args</span>
+<span id="L234" class="LineNr">234 </span>  68/push  &quot;F - test-trace-single&quot;/imm32
+<span id="L235" class="LineNr">235 </span>  68/push  0x0a6241/imm32/Ab-newline
+<span id="L236" class="LineNr">236 </span>    <span class="Comment"># push *Test-trace-stream.data</span>
+<span id="L237" class="LineNr">237 </span>  b8/copy-to-EAX  Test-trace-stream/imm32
+<span id="L238" class="LineNr">238 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
+<span id="L239" class="LineNr">239 </span>    <span class="Comment"># call</span>
+<span id="L240" class="LineNr">240 </span>  e8/call  check-ints-equal/disp32
+<span id="L241" class="LineNr">241 </span>    <span class="Comment"># discard args</span>
+<span id="L242" class="LineNr">242 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Comment"># end</span>
+<span id="L244" class="LineNr">244 </span>  c3/return
+<span id="L245" class="LineNr">245 </span>
+<span id="L246" class="LineNr">246 </span>test-trace-appends:
+<span id="L247" class="LineNr">247 </span>  <span class="Comment"># clear-trace-stream(Test-trace-stream)</span>
+<span id="L248" class="LineNr">248 </span>    <span class="Comment"># push args</span>
+<span id="L249" class="LineNr">249 </span>  68/push  Test-trace-stream/imm32
+<span id="L250" class="LineNr">250 </span>    <span class="Comment"># call</span>
+<span id="L251" class="LineNr">251 </span>  e8/call  clear-trace-stream/disp32
+<span id="L252" class="LineNr">252 </span>    <span class="Comment"># discard args</span>
+<span id="L253" class="LineNr">253 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Comment"># trace(Test-trace-stream, &quot;C&quot;)</span>
+<span id="L255" class="LineNr">255 </span>    <span class="Comment"># push args</span>
+<span id="L256" class="LineNr">256 </span>  68/push  &quot;C&quot;/imm32
+<span id="L257" class="LineNr">257 </span>  68/push  Test-trace-stream/imm32
+<span id="L258" class="LineNr">258 </span>    <span class="Comment"># call</span>
+<span id="L259" class="LineNr">259 </span>  e8/call  trace/disp32
+<span id="L260" class="LineNr">260 </span>    <span class="Comment"># discard args</span>
+<span id="L261" class="LineNr">261 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Comment"># trace(Test-trace-stream, &quot;D&quot;)</span>
+<span id="L263" class="LineNr">263 </span>    <span class="Comment"># push args</span>
+<span id="L264" class="LineNr">264 </span>  68/push  &quot;D&quot;/imm32
+<span id="L265" class="LineNr">265 </span>  68/push  Test-trace-stream/imm32
+<span id="L266" class="LineNr">266 </span>    <span class="Comment"># call</span>
+<span id="L267" class="LineNr">267 </span>  e8/call  trace/disp32
+<span id="L268" class="LineNr">268 </span>    <span class="Comment"># discard args</span>
+<span id="L269" class="LineNr">269 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Comment"># check-ints-equal(*Test-trace-stream.data, 43/C 0a/newline 44/D 0a/newline, msg)</span>
+<span id="L271" class="LineNr">271 </span>    <span class="Comment"># push args</span>
+<span id="L272" class="LineNr">272 </span>  68/push  &quot;F - test-trace-appends&quot;/imm32
+<span id="L273" class="LineNr">273 </span>  68/push  0x0a440a43/imm32/C-newline-D-newline
+<span id="L274" class="LineNr">274 </span>    <span class="Comment"># push *Test-trace-stream.data</span>
+<span id="L275" class="LineNr">275 </span>  b8/copy-to-EAX  Test-trace-stream/imm32
+<span id="L276" class="LineNr">276 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
+<span id="L277" class="LineNr">277 </span>    <span class="Comment"># call</span>
+<span id="L278" class="LineNr">278 </span>  e8/call  check-ints-equal/disp32
+<span id="L279" class="LineNr">279 </span>    <span class="Comment"># discard args</span>
+<span id="L280" class="LineNr">280 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Comment"># end</span>
+<span id="L282" class="LineNr">282 </span>  c3/return
+<span id="L283" class="LineNr">283 </span>
+<span id="L284" class="LineNr">284 </span>test-trace-empty-line:
+<span id="L285" class="LineNr">285 </span>  <span class="Comment"># clear-trace-stream(Test-trace-stream)</span>
+<span id="L286" class="LineNr">286 </span>    <span class="Comment"># push args</span>
+<span id="L287" class="LineNr">287 </span>  68/push  Test-trace-stream/imm32
+<span id="L288" class="LineNr">288 </span>    <span class="Comment"># call</span>
+<span id="L289" class="LineNr">289 </span>  e8/call  clear-trace-stream/disp32
+<span id="L290" class="LineNr">290 </span>    <span class="Comment"># discard args</span>
+<span id="L291" class="LineNr">291 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Comment"># trace(Test-trace-stream, &quot;&quot;)</span>
+<span id="L293" class="LineNr">293 </span>    <span class="Comment"># push args</span>
+<span id="L294" class="LineNr">294 </span>  68/push  &quot;&quot;/imm32
+<span id="L295" class="LineNr">295 </span>  68/push  Test-trace-stream/imm32
+<span id="L296" class="LineNr">296 </span>    <span class="Comment"># call</span>
+<span id="L297" class="LineNr">297 </span>  e8/call  trace/disp32
+<span id="L298" class="LineNr">298 </span>    <span class="Comment"># discard args</span>
+<span id="L299" class="LineNr">299 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Comment"># check-ints-equal(*Test-trace-stream.data, 0, msg)</span>
+<span id="L301" class="LineNr">301 </span>    <span class="Comment"># push args</span>
+<span id="L302" class="LineNr">302 </span>  68/push  &quot;F - test-trace-empty-line&quot;/imm32
+<span id="L303" class="LineNr">303 </span>  68/push  0/imm32
+<span id="L304" class="LineNr">304 </span>    <span class="Comment"># push *Test-trace-stream.data</span>
+<span id="L305" class="LineNr">305 </span>  b8/copy-to-EAX  Test-trace-stream/imm32
+<span id="L306" class="LineNr">306 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
+<span id="L307" class="LineNr">307 </span>    <span class="Comment"># call</span>
+<span id="L308" class="LineNr">308 </span>  e8/call  check-ints-equal/disp32
+<span id="L309" class="LineNr">309 </span>    <span class="Comment"># discard args</span>
+<span id="L310" class="LineNr">310 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L311" class="LineNr">311 </span>  <span class="Comment"># end</span>
+<span id="L312" class="LineNr">312 </span>  c3/return
+<span id="L313" class="LineNr">313 </span>
+<span id="L314" class="LineNr">314 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/056write.subx.html b/html/subx/056write.subx.html
new file mode 100644
index 00000000..89d8859b
--- /dev/null
+++ b/html/subx/056write.subx.html
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/056write.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="Comment"># write: like _write, but also support in-memory output streams (`ostream`s)</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment"># in addition to file descriptors.</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">#</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment"># Our first dependency-injected and testable primitive. We can pass it either</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment"># a file descriptor or an address to an output stream or ostream. If a file</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment"># descriptor is passed in, we _write to it using the right syscall. If a 'fake</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment"># file descriptor' or ostream is passed in, we append to the output stream.</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment"># This lets us redirect output in tests and check it later.</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">#</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment"># We assume our data segment will never begin at an address shorter than</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment"># 0x08000000, so any smaller arguments are assumed to be real file descriptors.</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment"># An ostream looks like this:</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   write: int  # index at which writes go</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   data: (array byte)  # prefixed by length as usual</span>
+<span id="L16" class="LineNr"> 16 </span>
+<span id="L17" class="LineNr"> 17 </span>== data
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment"># In-memory ostream for tests to write() to.</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment"># Also illustrates the layout of ostreams.</span>
+<span id="L21" class="LineNr"> 21 </span>Test-ostream:
+<span id="L22" class="LineNr"> 22 </span>  <span class="Comment"># current write index</span>
+<span id="L23" class="LineNr"> 23 </span>  00 00 00 00
+<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L25" class="LineNr"> 25 </span>  08 00 00 00
+<span id="L26" class="LineNr"> 26 </span>  <span class="Comment"># data</span>
+<span id="L27" class="LineNr"> 27 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L28" class="LineNr"> 28 </span>
+<span id="L29" class="LineNr"> 29 </span>== code
+<span id="L30" class="LineNr"> 30 </span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L33" class="LineNr"> 33 </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="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L36" class="LineNr"> 36 </span><span class="CommentedCode">#?   e8/call  test-write-appends/disp32</span>
+<span id="L37" class="LineNr"> 37 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
+<span id="L39" class="LineNr"> 39 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/EBX   Num-test-failures/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L40" class="LineNr"> 40 </span>  b8/copy-to-EAX  1/imm32
+<span id="L41" class="LineNr"> 41 </span>  cd/syscall  0x80/imm8
+<span id="L42" class="LineNr"> 42 </span>
+<span id="L43" class="LineNr"> 43 </span>write:  <span class="Comment"># f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># prolog</span>
+<span id="L45" class="LineNr"> 45 </span>  55/push-EBP
+<span id="L46" class="LineNr"> 46 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="Comment"># save registers</span>
+<span id="L48" class="LineNr"> 48 </span>  50/push-EAX
+<span id="L49" class="LineNr"> 49 </span>  51/push-ECX
+<span id="L50" class="LineNr"> 50 </span>  52/push-EDX
+<span id="L51" class="LineNr"> 51 </span>  53/push-EBX
+<span id="L52" class="LineNr"> 52 </span>  56/push-ESI
+<span id="L53" class="LineNr"> 53 </span>  <span class="Comment"># if (f &lt; 0x08000000) _write(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
+<span id="L54" class="LineNr"> 54 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         0x08000000/imm32  <span class="Comment"># compare *(EBP+8)</span>
+<span id="L55" class="LineNr"> 55 </span>  7f/jump-if-greater  $write:else/disp8
+<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># push args</span>
+<span id="L57" class="LineNr"> 57 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
+<span id="L58" class="LineNr"> 58 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="Comment"># call</span>
+<span id="L60" class="LineNr"> 60 </span>  e8/call  _write/disp32
+<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># discard args</span>
+<span id="L62" class="LineNr"> 62 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L63" class="LineNr"> 63 </span>  eb/jump  $write:end/disp8
+<span id="L64" class="LineNr"> 64 </span>$write:else:
+<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># otherwise, treat 'f' as a stream to append to</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Comment">#</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># pseudocode:</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Comment">#   destend = &amp;f.data[t.length]</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Comment">#   oldw = f.write</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Comment">#   if s.length == 0 return</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Comment">#   f.write += s.length</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Comment">#   dest = &amp;f.data[oldw]</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Comment">#   srcend = &amp;s.data[s.length]</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="Comment">#   src = &amp;s.data[0]</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Comment">#   while true:</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Comment">#     if src &gt;= srcend break</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Comment">#     if dest &gt;= destend break  # for now silently ignore filled up ostream buffer</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Comment">#     *dest = *src</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Comment">#     ++src</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">#     ++dest</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Comment">#</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment"># key registers to set up for the loop:</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="Comment">#   EAX/dest, ECX/destend, EBX/src, ESI/srcend</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="Comment"># we save EDX for byte operations (has to be one of the first 4 registers)</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">#</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># register setup before the loop:</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="Comment">#   EAX = *(EBP+8)    # f</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Comment">#   EBX = *(EBP+12)   # s</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Comment">#   ECX = *(EAX+4)    # f.length</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Comment">#   ECX = EAX+8+ECX  # destend = &amp;f.data[f.length]</span>
+<span id="L91" class="LineNr"> 91 </span>  <span class="Comment">#   ESI = *EAX        # oldw = f.write</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Comment">#   EDX = *EBX        # s.length</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Comment">#   *EAX = *EAX + EDX # update f.write  (allowed to go past f.length)</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Comment">#                     # do this here just because it's convenient</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Comment">#   EAX = EAX+8+ESI  # dest = &amp;f.data[oldw]</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">#   ESI = EBX+4+EDX   # srcend = &amp;s.data[s.length]</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">#   EBX = EBX+4       # src = &amp;s.data[0]</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">#</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Comment"># EAX = f</span>
+<span id="L100" class="LineNr">100 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment"># EBX = s</span>
+<span id="L102" class="LineNr">102 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Comment"># ECX = f.length</span>
+<span id="L104" class="LineNr">104 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EAX+4) to ECX</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Comment"># ECX/destend = &amp;f.data[f.length]</span>
+<span id="L106" class="LineNr">106 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+8 to ECX</span>
+<span id="L107" class="LineNr">107 </span>  <span class="Comment"># ESI/oldw = f.write</span>
+<span id="L108" class="LineNr">108 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to ESI</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Comment"># EDX = s.length</span>
+<span id="L110" class="LineNr">110 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EBX to EDX</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Comment"># if EDX == 0 return</span>
+<span id="L112" class="LineNr">112 </span>  81          7/subop/compare     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EDX</span>
+<span id="L113" class="LineNr">113 </span>  74/jump-if-equal  $write:end/disp8
+<span id="L114" class="LineNr">114 </span>  <span class="Comment"># f.write += s.length</span>
+<span id="L115" class="LineNr">115 </span>  01/add                          0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EDX to *EAX</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Comment"># EAX/dest = &amp;f.data[oldw]</span>
+<span id="L117" class="LineNr">117 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  6/index/ESI  <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ESI+8 to EAX</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Comment"># ESI/srcend = &amp;s.data[s.length]</span>
+<span id="L119" class="LineNr">119 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    3/base/EBX  2/index/EDX  <span class="Delimiter"> . </span>          6/r32/ESI   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EBX+EDX+4 to ESI</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment"># EBX/src = &amp;s.data[0]</span>
+<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to EBX</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment"># while (true)</span>
+<span id="L123" class="LineNr">123 </span>$write:loop:
+<span id="L124" class="LineNr">124 </span>  <span class="Comment"># if EBX/src &gt;= ESI/srcend break</span>
+<span id="L125" class="LineNr">125 </span>  39/compare                      3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EBX with ESI</span>
+<span id="L126" class="LineNr">126 </span>  7d/jump-if-greater-or-equal  $write:end/disp8
+<span id="L127" class="LineNr">127 </span>  <span class="Comment"># if EAX/dest &gt;= ECX/destend break  (for now silently ignore filled up ostream buffer)</span>
+<span id="L128" class="LineNr">128 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L129" class="LineNr">129 </span>  7d/jump-if-greater-or-equal  $write:end/disp8
+<span id="L130" class="LineNr">130 </span>  <span class="Comment"># copy one byte</span>
+<span id="L131" class="LineNr">131 </span>  8a/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/DL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EBX to DL</span>
+<span id="L132" class="LineNr">132 </span>  88/copy-byte                    0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/DL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at DL to *EAX</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Comment"># updates</span>
+<span id="L134" class="LineNr">134 </span>  40/increment-EAX
+<span id="L135" class="LineNr">135 </span>  43/increment-EBX
+<span id="L136" class="LineNr">136 </span>  eb/jump  $write:loop/disp8
+<span id="L137" class="LineNr">137 </span>$write:end:
+<span id="L138" class="LineNr">138 </span>  <span class="Comment"># restore registers</span>
+<span id="L139" class="LineNr">139 </span>  5e/pop-to-ESI
+<span id="L140" class="LineNr">140 </span>  5b/pop-to-EBX
+<span id="L141" class="LineNr">141 </span>  5a/pop-to-EDX
+<span id="L142" class="LineNr">142 </span>  59/pop-to-ECX
+<span id="L143" class="LineNr">143 </span>  58/pop-to-EAX
+<span id="L144" class="LineNr">144 </span>  <span class="Comment"># epilog</span>
+<span id="L145" class="LineNr">145 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L146" class="LineNr">146 </span>  5d/pop-to-EBP
+<span id="L147" class="LineNr">147 </span>  c3/return
+<span id="L148" class="LineNr">148 </span>
+<span id="L149" class="LineNr">149 </span>clear-ostream:  <span class="Comment"># f : (address ostream)</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Comment"># prolog</span>
+<span id="L151" class="LineNr">151 </span>  55/push-EBP
+<span id="L152" class="LineNr">152 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Comment"># save registers</span>
+<span id="L154" class="LineNr">154 </span>  50/push-EAX
+<span id="L155" class="LineNr">155 </span>  51/push-ECX
+<span id="L156" class="LineNr">156 </span>  <span class="Comment"># EAX = f</span>
+<span id="L157" class="LineNr">157 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Comment"># ECX = f.length</span>
+<span id="L159" class="LineNr">159 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EAX+4) to ECX</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Comment"># ECX = &amp;f.data[f.length]</span>
+<span id="L161" class="LineNr">161 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+8 to ECX</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Comment"># f.write = 0</span>
+<span id="L163" class="LineNr">163 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Comment"># EAX = f.data</span>
+<span id="L165" class="LineNr">165 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to EAX</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Comment"># while (true)</span>
+<span id="L167" class="LineNr">167 </span>$clear-ostream:loop:
+<span id="L168" class="LineNr">168 </span>  <span class="Comment"># if EAX &gt;= ECX break</span>
+<span id="L169" class="LineNr">169 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L170" class="LineNr">170 </span>  7d/jump-if-greater-or-equal  $clear-ostream:end/disp8
+<span id="L171" class="LineNr">171 </span>  <span class="Comment"># *EAX = 0</span>
+<span id="L172" class="LineNr">172 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Comment"># EAX += 4</span>
+<span id="L174" class="LineNr">174 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to EAX</span>
+<span id="L175" class="LineNr">175 </span>  eb/jump  $clear-ostream:loop/disp8
+<span id="L176" class="LineNr">176 </span>$clear-ostream:end:
+<span id="L177" class="LineNr">177 </span>  <span class="Comment"># restore registers</span>
+<span id="L178" class="LineNr">178 </span>  59/pop-to-ECX
+<span id="L179" class="LineNr">179 </span>  58/pop-to-EAX
+<span id="L180" class="LineNr">180 </span>  <span class="Comment"># epilog</span>
+<span id="L181" class="LineNr">181 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L182" class="LineNr">182 </span>  5d/pop-to-EBP
+<span id="L183" class="LineNr">183 </span>  c3/return
+<span id="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span>test-write-single:
+<span id="L186" class="LineNr">186 </span>  <span class="Comment"># clear-ostream(Test-ostream)</span>
+<span id="L187" class="LineNr">187 </span>    <span class="Comment"># push args</span>
+<span id="L188" class="LineNr">188 </span>  68/push  Test-ostream/imm32
+<span id="L189" class="LineNr">189 </span>    <span class="Comment"># call</span>
+<span id="L190" class="LineNr">190 </span>  e8/call  clear-ostream/disp32
+<span id="L191" class="LineNr">191 </span>    <span class="Comment"># discard args</span>
+<span id="L192" class="LineNr">192 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Comment"># write(Test-ostream, &quot;Ab&quot;)</span>
+<span id="L194" class="LineNr">194 </span>    <span class="Comment"># push args</span>
+<span id="L195" class="LineNr">195 </span>  68/push  &quot;Ab&quot;/imm32
+<span id="L196" class="LineNr">196 </span>  68/push  Test-ostream/imm32
+<span id="L197" class="LineNr">197 </span>    <span class="Comment"># call</span>
+<span id="L198" class="LineNr">198 </span>  e8/call  write/disp32
+<span id="L199" class="LineNr">199 </span>    <span class="Comment"># discard args</span>
+<span id="L200" class="LineNr">200 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Comment"># check-ints-equal(*Test-ostream.data, 41/A 62/b 00 00, msg)</span>
+<span id="L202" class="LineNr">202 </span>    <span class="Comment"># push args</span>
+<span id="L203" class="LineNr">203 </span>  68/push  &quot;F - test-write-single&quot;/imm32
+<span id="L204" class="LineNr">204 </span>  68/push  0x006241/imm32/Ab
+<span id="L205" class="LineNr">205 </span>    <span class="Comment"># push *Test-ostream.data</span>
+<span id="L206" class="LineNr">206 </span>  b8/copy-to-EAX  Test-ostream/imm32
+<span id="L207" class="LineNr">207 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+8)</span>
+<span id="L208" class="LineNr">208 </span>    <span class="Comment"># call</span>
+<span id="L209" class="LineNr">209 </span>  e8/call  check-ints-equal/disp32
+<span id="L210" class="LineNr">210 </span>    <span class="Comment"># discard args</span>
+<span id="L211" class="LineNr">211 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Comment"># end</span>
+<span id="L213" class="LineNr">213 </span>  c3/return
+<span id="L214" class="LineNr">214 </span>
+<span id="L215" class="LineNr">215 </span>test-write-appends:
+<span id="L216" class="LineNr">216 </span>  <span class="Comment"># clear-ostream(Test-ostream)</span>
+<span id="L217" class="LineNr">217 </span>    <span class="Comment"># push args</span>
+<span id="L218" class="LineNr">218 </span>  68/push  Test-ostream/imm32
+<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L220" class="LineNr">220 </span>  e8/call  clear-ostream/disp32
+<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
+<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Comment"># write(Test-ostream, &quot;C&quot;)</span>
+<span id="L224" class="LineNr">224 </span>    <span class="Comment"># push args</span>
+<span id="L225" class="LineNr">225 </span>  68/push  &quot;C&quot;/imm32
+<span id="L226" class="LineNr">226 </span>  68/push  Test-ostream/imm32
+<span id="L227" class="LineNr">227 </span>    <span class="Comment"># call</span>
+<span id="L228" class="LineNr">228 </span>  e8/call  write/disp32
+<span id="L229" class="LineNr">229 </span>    <span class="Comment"># discard args</span>
+<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Comment"># write(Test-ostream, &quot;D&quot;)</span>
+<span id="L232" class="LineNr">232 </span>    <span class="Comment"># push args</span>
+<span id="L233" class="LineNr">233 </span>  68/push  &quot;D&quot;/imm32
+<span id="L234" class="LineNr">234 </span>  68/push  Test-ostream/imm32
+<span id="L235" class="LineNr">235 </span>    <span class="Comment"># call</span>
+<span id="L236" class="LineNr">236 </span>  e8/call  write/disp32
+<span id="L237" class="LineNr">237 </span>    <span class="Comment"># discard args</span>
+<span id="L238" class="LineNr">238 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L239" class="LineNr">239 </span>  <span class="Comment"># check-ints-equal(*Test-ostream.data, 43/C 44/D 00 00, msg)</span>
+<span id="L240" class="LineNr">240 </span>    <span class="Comment"># push args</span>
+<span id="L241" class="LineNr">241 </span>  68/push  &quot;F - test-write-appends&quot;/imm32
+<span id="L242" class="LineNr">242 </span>  68/push  0x00004443/imm32/C-D
+<span id="L243" class="LineNr">243 </span>    <span class="Comment"># push *Test-ostream.data</span>
+<span id="L244" class="LineNr">244 </span>  b8/copy-to-EAX  Test-ostream/imm32
+<span id="L245" class="LineNr">245 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+8)</span>
+<span id="L246" class="LineNr">246 </span>    <span class="Comment"># call</span>
+<span id="L247" class="LineNr">247 </span>  e8/call  check-ints-equal/disp32
+<span id="L248" class="LineNr">248 </span>    <span class="Comment"># discard args</span>
+<span id="L249" class="LineNr">249 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Comment"># end</span>
+<span id="L251" class="LineNr">251 </span>  c3/return
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index 8ac601ec..1ff68646 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -54,121 +54,94 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment"># corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">#   $ subx translate *.subx apps/crenshaw2.1.subx -o crenshaw 2.1</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">#   $ echo '3'  |subx run apps/crenshaw2.1  |xxd -</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># Expected output:</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">#   TODO</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># The output is the code a function would need to include, returning the</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment"># result in EAX.</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># Major note: byte strings are not null-terminated. Instead they're prefixed</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment"># with a 32-bit length.</span>
-<span id="L15" class="LineNr"> 15 </span>
-<span id="L16" class="LineNr"> 16 </span>== code
-<span id="L17" class="LineNr"> 17 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L19" class="LineNr"> 19 </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="L20" class="LineNr"> 20 </span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment"># main:</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Comment"># abort(&quot;Integer&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span>    <span class="Comment"># push args</span>
-<span id="L24" class="LineNr"> 24 </span>  68/push  &quot;Integer&quot;/imm32
-<span id="L25" class="LineNr"> 25 </span>    <span class="Comment"># call</span>
-<span id="L26" class="LineNr"> 26 </span>  e8/call  abort/disp32
-<span id="L27" class="LineNr"> 27 </span>    <span class="Comment"># discard arg</span>
-<span id="L28" class="LineNr"> 28 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Comment"># exit(0)</span>
-<span id="L30" class="LineNr"> 30 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L31" class="LineNr"> 31 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
-<span id="L32" class="LineNr"> 32 </span>  cd/syscall  0x80/imm8
-<span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="SalientComment">## helpers</span>
-<span id="L35" class="LineNr"> 35 </span>
-<span id="L36" class="LineNr"> 36 </span><span class="Comment"># print error message and exit</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment"># really maps to the 'Expected' function in Crenshaw</span>
-<span id="L38" class="LineNr"> 38 </span>abort:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># error(s)</span>
-<span id="L40" class="LineNr"> 40 </span>    <span class="Comment"># push args</span>
-<span id="L41" class="LineNr"> 41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
-<span id="L42" class="LineNr"> 42 </span>    <span class="Comment"># call</span>
-<span id="L43" class="LineNr"> 43 </span>  e8/call  error/disp32
-<span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># discard arg</span>
-<span id="L45" class="LineNr"> 45 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Comment"># exit(1)</span>
-<span id="L47" class="LineNr"> 47 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L48" class="LineNr"> 48 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
-<span id="L49" class="LineNr"> 49 </span>  cd/syscall  0x80/imm8
-<span id="L50" class="LineNr"> 50 </span>
-<span id="L51" class="LineNr"> 51 </span><span class="Comment"># print out &quot;Error: #{s} expected\n&quot; to stderr</span>
-<span id="L52" class="LineNr"> 52 </span>error:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Comment"># write_stderr(&quot;Error: &quot;)</span>
-<span id="L54" class="LineNr"> 54 </span>    <span class="Comment"># push args</span>
-<span id="L55" class="LineNr"> 55 </span>  68/push  &quot;Error: &quot;/imm32
-<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># call</span>
-<span id="L57" class="LineNr"> 57 </span>  e8/call  write_stderr/disp32
-<span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># discard arg</span>
-<span id="L59" class="LineNr"> 59 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># write_stderr(s)</span>
-<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># push args</span>
-<span id="L62" class="LineNr"> 62 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># call</span>
-<span id="L64" class="LineNr"> 64 </span>  e8/call  write_stderr/disp32
-<span id="L65" class="LineNr"> 65 </span>    <span class="Comment"># discard arg</span>
-<span id="L66" class="LineNr"> 66 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># write_stderr(&quot; expected&quot;)</span>
-<span id="L68" class="LineNr"> 68 </span>    <span class="Comment"># push args</span>
-<span id="L69" class="LineNr"> 69 </span>  68/push  &quot; expected&quot;/imm32
-<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># call</span>
-<span id="L71" class="LineNr"> 71 </span>  e8/call  write_stderr/disp32
-<span id="L72" class="LineNr"> 72 </span>    <span class="Comment"># discard arg</span>
-<span id="L73" class="LineNr"> 73 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># write_stderr(&quot;\n&quot;)</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># push args</span>
-<span id="L76" class="LineNr"> 76 </span>  68/push  Newline/imm32
-<span id="L77" class="LineNr"> 77 </span>    <span class="Comment"># call</span>
-<span id="L78" class="LineNr"> 78 </span>  e8/call  write_stderr/disp32
-<span id="L79" class="LineNr"> 79 </span>    <span class="Comment"># discard arg</span>
-<span id="L80" class="LineNr"> 80 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># end</span>
-<span id="L82" class="LineNr"> 82 </span>  c3/return
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span>write_stdout:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># prolog</span>
-<span id="L86" class="LineNr"> 86 </span>  55/push-EBP
-<span id="L87" class="LineNr"> 87 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># save registers</span>
-<span id="L89" class="LineNr"> 89 </span>  50/push-EAX
-<span id="L90" class="LineNr"> 90 </span>  51/push-ECX
-<span id="L91" class="LineNr"> 91 </span>  52/push-EDX
-<span id="L92" class="LineNr"> 92 </span>  53/push-EBX
-<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># write(1/stdout, (data) s+4, (size) *s)</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L95" class="LineNr"> 95 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L96" class="LineNr"> 96 </span>    <span class="Comment"># x = s+4</span>
-<span id="L97" class="LineNr"> 97 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
-<span id="L98" class="LineNr"> 98 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ECX</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Comment"># size = *s</span>
-<span id="L100" class="LineNr">100 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDX</span>
-<span id="L101" class="LineNr">101 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># call write()</span>
-<span id="L103" class="LineNr">103 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
-<span id="L104" class="LineNr">104 </span>  cd/syscall  0x80/imm8
-<span id="L105" class="LineNr">105 </span>  <span class="Comment"># restore registers</span>
-<span id="L106" class="LineNr">106 </span>  5b/pop-to-EBX
-<span id="L107" class="LineNr">107 </span>  5a/pop-to-EDX
-<span id="L108" class="LineNr">108 </span>  59/pop-to-ECX
-<span id="L109" class="LineNr">109 </span>  58/pop-to-EAX
-<span id="L110" class="LineNr">110 </span>  <span class="Comment"># end</span>
-<span id="L111" class="LineNr">111 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="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="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment"># corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run (from the subx directory):</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx translate *.subx apps/crenshaw2.1.subx -o crenshaw 2.1</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ echo '3'  |subx run apps/crenshaw2.1  |xxd -</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected output:</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   TODO</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment">#</span>
+<span id="L10" class="LineNr">10 </span><span class="Comment"># The output is the code a function would need to include, returning the</span>
+<span id="L11" class="LineNr">11 </span><span class="Comment"># result in EAX.</span>
+<span id="L12" class="LineNr">12 </span><span class="Comment">#</span>
+<span id="L13" class="LineNr">13 </span><span class="Comment"># Major note: byte strings are not null-terminated. Instead they're prefixed</span>
+<span id="L14" class="LineNr">14 </span><span class="Comment"># with a 32-bit length.</span>
+<span id="L15" class="LineNr">15 </span>
+<span id="L16" class="LineNr">16 </span>== code
+<span id="L17" class="LineNr">17 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L18" class="LineNr">18 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L19" class="LineNr">19 </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="L20" class="LineNr">20 </span>
+<span id="L21" class="LineNr">21 </span><span class="Comment"># main:</span>
+<span id="L22" class="LineNr">22 </span>  <span class="Comment"># abort(&quot;Integer&quot;)</span>
+<span id="L23" class="LineNr">23 </span>    <span class="Comment"># push args</span>
+<span id="L24" class="LineNr">24 </span>  68/push  &quot;Integer&quot;/imm32
+<span id="L25" class="LineNr">25 </span>    <span class="Comment"># call</span>
+<span id="L26" class="LineNr">26 </span>  e8/call  abort/disp32
+<span id="L27" class="LineNr">27 </span>    <span class="Comment"># discard arg</span>
+<span id="L28" class="LineNr">28 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L29" class="LineNr">29 </span>  <span class="Comment"># syscall(exit, 0)</span>
+<span id="L30" class="LineNr">30 </span>  bb/copy-to-EBX  0/imm32
+<span id="L31" class="LineNr">31 </span>  b8/copy-to-EAX  1/imm32/exit
+<span id="L32" class="LineNr">32 </span>  cd/syscall  0x80/imm8
+<span id="L33" class="LineNr">33 </span>
+<span id="L34" class="LineNr">34 </span><span class="SalientComment">## helpers</span>
+<span id="L35" class="LineNr">35 </span>
+<span id="L36" class="LineNr">36 </span><span class="Comment"># print error message and exit</span>
+<span id="L37" class="LineNr">37 </span><span class="Comment"># really maps to the 'Expected' function in Crenshaw</span>
+<span id="L38" class="LineNr">38 </span>abort:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L39" class="LineNr">39 </span>  <span class="Comment"># error(s)</span>
+<span id="L40" class="LineNr">40 </span>    <span class="Comment"># push args</span>
+<span id="L41" class="LineNr">41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
+<span id="L42" class="LineNr">42 </span>    <span class="Comment"># call</span>
+<span id="L43" class="LineNr">43 </span>  e8/call  error/disp32
+<span id="L44" class="LineNr">44 </span>    <span class="Comment"># discard arg</span>
+<span id="L45" class="LineNr">45 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L46" class="LineNr">46 </span>  <span class="Comment"># syscall(exit, 1)</span>
+<span id="L47" class="LineNr">47 </span>  bb/copy-to-EBX  1/imm32
+<span id="L48" class="LineNr">48 </span>  b8/copy-to-EAX  1/imm32/exit
+<span id="L49" class="LineNr">49 </span>  cd/syscall  0x80/imm8
+<span id="L50" class="LineNr">50 </span>
+<span id="L51" class="LineNr">51 </span><span class="Comment"># print out &quot;Error: #{s} expected\n&quot; to stderr</span>
+<span id="L52" class="LineNr">52 </span>error:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L53" class="LineNr">53 </span>  <span class="Comment"># _write(2/stderr, &quot;Error: &quot;)</span>
+<span id="L54" class="LineNr">54 </span>    <span class="Comment"># push args</span>
+<span id="L55" class="LineNr">55 </span>  68/push  &quot;Error: &quot;/imm32
+<span id="L56" class="LineNr">56 </span>  68/push  2/imm32/stderr
+<span id="L57" class="LineNr">57 </span>    <span class="Comment"># call</span>
+<span id="L58" class="LineNr">58 </span>  e8/call  _write/disp32
+<span id="L59" class="LineNr">59 </span>    <span class="Comment"># discard arg</span>
+<span id="L60" class="LineNr">60 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L61" class="LineNr">61 </span>  <span class="Comment"># _write(2/stderr, s)</span>
+<span id="L62" class="LineNr">62 </span>    <span class="Comment"># push args</span>
+<span id="L63" class="LineNr">63 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
+<span id="L64" class="LineNr">64 </span>  68/push  2/imm32/stderr
+<span id="L65" class="LineNr">65 </span>    <span class="Comment"># call</span>
+<span id="L66" class="LineNr">66 </span>  e8/call  _write/disp32
+<span id="L67" class="LineNr">67 </span>    <span class="Comment"># discard arg</span>
+<span id="L68" class="LineNr">68 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L69" class="LineNr">69 </span>  <span class="Comment"># _write(2/stderr, &quot; expected&quot;)</span>
+<span id="L70" class="LineNr">70 </span>    <span class="Comment"># push args</span>
+<span id="L71" class="LineNr">71 </span>  68/push  &quot; expected&quot;/imm32
+<span id="L72" class="LineNr">72 </span>  68/push  2/imm32/stderr
+<span id="L73" class="LineNr">73 </span>    <span class="Comment"># call</span>
+<span id="L74" class="LineNr">74 </span>  e8/call  _write/disp32
+<span id="L75" class="LineNr">75 </span>    <span class="Comment"># discard arg</span>
+<span id="L76" class="LineNr">76 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L77" class="LineNr">77 </span>  <span class="Comment"># _write(2/stderr, &quot;\n&quot;)</span>
+<span id="L78" class="LineNr">78 </span>    <span class="Comment"># push args</span>
+<span id="L79" class="LineNr">79 </span>  68/push  Newline/imm32
+<span id="L80" class="LineNr">80 </span>  68/push  2/imm32/stderr
+<span id="L81" class="LineNr">81 </span>    <span class="Comment"># call</span>
+<span id="L82" class="LineNr">82 </span>  e8/call  _write/disp32
+<span id="L83" class="LineNr">83 </span>    <span class="Comment"># discard arg</span>
+<span id="L84" class="LineNr">84 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L85" class="LineNr">85 </span>  <span class="Comment"># end</span>
+<span id="L86" class="LineNr">86 </span>  c3/return
+<span id="L87" class="LineNr">87 </span>
+<span id="L88" class="LineNr">88 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 7111a908..8e65e9cc 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -79,88 +79,89 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span>  <span class="Comment"># prolog</span>
 <span id="L24" class="LineNr"> 24 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># if (argc &gt; 1)</span>
-<span id="L26" class="LineNr"> 26 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0/disp8         1/imm32           <span class="Comment"># compare *EBP</span>
-<span id="L27" class="LineNr"> 27 </span>  7e/jump-if-lesser-or-equal  $run_main/disp8
+<span id="L26" class="LineNr"> 26 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0/disp8         1/imm32           <span class="Comment"># compare *EBP</span>
+<span id="L27" class="LineNr"> 27 </span>  7e/jump-if-lesser-or-equal  $run-main/disp8
 <span id="L28" class="LineNr"> 28 </span>  <span class="Comment"># and if (argv[1] == &quot;test&quot;)</span>
 <span id="L29" class="LineNr"> 29 </span>    <span class="Comment"># push args</span>
 <span id="L30" class="LineNr"> 30 </span>  68/push  &quot;test&quot;/imm32
 <span id="L31" class="LineNr"> 31 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="Comment"># call</span>
-<span id="L33" class="LineNr"> 33 </span>  e8/call  kernel_string_equal/disp32
+<span id="L33" class="LineNr"> 33 </span>  e8/call  kernel-string-equal/disp32
 <span id="L34" class="LineNr"> 34 </span>    <span class="Comment"># discard args</span>
 <span id="L35" class="LineNr"> 35 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="Comment"># check result</span>
 <span id="L37" class="LineNr"> 37 </span>  3d/compare-EAX  1/imm32
-<span id="L38" class="LineNr"> 38 </span>  75/jump-if-not-equal  $run_main/disp8
-<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># then</span>
-<span id="L40" class="LineNr"> 40 </span>  e8/call  run_tests/disp32
-<span id="L41" class="LineNr"> 41 </span>  eb/jump  $main_exit/disp8
-<span id="L42" class="LineNr"> 42 </span>  <span class="Comment"># else EAX = factorial(5)</span>
-<span id="L43" class="LineNr"> 43 </span>$run_main:
-<span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># push arg</span>
-<span id="L45" class="LineNr"> 45 </span>  68/push  5/imm32
-<span id="L46" class="LineNr"> 46 </span>    <span class="Comment"># call</span>
-<span id="L47" class="LineNr"> 47 </span>  e8/call  factorial/disp32
-<span id="L48" class="LineNr"> 48 </span>    <span class="Comment"># discard arg</span>
-<span id="L49" class="LineNr"> 49 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L50" class="LineNr"> 50 </span>$main_exit:
-<span id="L51" class="LineNr"> 51 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L52" class="LineNr"> 52 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L53" class="LineNr"> 53 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L54" class="LineNr"> 54 </span>  cd/syscall  0x80/imm8
-<span id="L55" class="LineNr"> 55 </span>
-<span id="L56" class="LineNr"> 56 </span><span class="Comment"># factorial(n)</span>
-<span id="L57" class="LineNr"> 57 </span>factorial:
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># prolog</span>
-<span id="L59" class="LineNr"> 59 </span>  55/push-EBP
-<span id="L60" class="LineNr"> 60 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L61" class="LineNr"> 61 </span>  53/push-EBX
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
-<span id="L63" class="LineNr"> 63 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
-<span id="L65" class="LineNr"> 65 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         1/imm32           <span class="Comment"># compare *(EBP+8)</span>
-<span id="L66" class="LineNr"> 66 </span>  7e/jump-if-&lt;=  $factorial:exit/disp8
-<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># EBX: n-1</span>
-<span id="L68" class="LineNr"> 68 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
-<span id="L69" class="LineNr"> 69 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract from EBX</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Comment"># EAX = factorial(n-1)</span>
-<span id="L71" class="LineNr"> 71 </span>    <span class="Comment"># push args</span>
-<span id="L72" class="LineNr"> 72 </span>  53/push-EBX
-<span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># call</span>
-<span id="L74" class="LineNr"> 74 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
-<span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># discard arg</span>
-<span id="L76" class="LineNr"> 76 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L78" class="LineNr"> 78 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(EBP+8) into EAX</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Comment"># TODO: check for overflow</span>
-<span id="L80" class="LineNr"> 80 </span>$factorial:exit:
-<span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># epilog</span>
-<span id="L82" class="LineNr"> 82 </span>  5b/pop-to-EBX
-<span id="L83" class="LineNr"> 83 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L84" class="LineNr"> 84 </span>  5d/pop-to-EBP
-<span id="L85" class="LineNr"> 85 </span>  c3/return
-<span id="L86" class="LineNr"> 86 </span>
-<span id="L87" class="LineNr"> 87 </span>test_factorial:
-<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># factorial(5)</span>
-<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># push arg</span>
-<span id="L90" class="LineNr"> 90 </span>  68/push  5/imm32
-<span id="L91" class="LineNr"> 91 </span>    <span class="Comment"># call</span>
-<span id="L92" class="LineNr"> 92 </span>  e8/call  factorial/disp32
-<span id="L93" class="LineNr"> 93 </span>    <span class="Comment"># discard arg</span>
-<span id="L94" class="LineNr"> 94 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># check_ints_equal(EAX, 120, failure message)</span>
-<span id="L96" class="LineNr"> 96 </span>    <span class="Comment"># push args</span>
-<span id="L97" class="LineNr"> 97 </span>  68/push  &quot;F - test_factorial&quot;/imm32
-<span id="L98" class="LineNr"> 98 </span>  68/push  0x78/imm32/expected-120
-<span id="L99" class="LineNr"> 99 </span>  50/push-EAX
-<span id="L100" class="LineNr">100 </span>    <span class="Comment"># call</span>
-<span id="L101" class="LineNr">101 </span>  e8/call  check_ints_equal/disp32
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># discard args</span>
-<span id="L103" class="LineNr">103 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Comment"># end</span>
-<span id="L105" class="LineNr">105 </span>  c3/return
-<span id="L106" class="LineNr">106 </span>
-<span id="L107" class="LineNr">107 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L38" class="LineNr"> 38 </span>  75/jump-if-not-equal  $run-main/disp8
+<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># then return run-tests()</span>
+<span id="L40" class="LineNr"> 40 </span>  e8/call  run-tests/disp32
+<span id="L41" class="LineNr"> 41 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   Num-test-failures/disp32          <span class="Comment"># copy *Num-test-failures to EAX</span>
+<span id="L42" class="LineNr"> 42 </span>  eb/jump  $main:end/disp8  <span class="Comment"># where EAX will get copied to EBX</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="Comment"># else EAX = factorial(5)</span>
+<span id="L44" class="LineNr"> 44 </span>$run-main:
+<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># push arg</span>
+<span id="L46" class="LineNr"> 46 </span>  68/push  5/imm32
+<span id="L47" class="LineNr"> 47 </span>    <span class="Comment"># call</span>
+<span id="L48" class="LineNr"> 48 </span>  e8/call  factorial/disp32
+<span id="L49" class="LineNr"> 49 </span>    <span class="Comment"># discard arg</span>
+<span id="L50" class="LineNr"> 50 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L51" class="LineNr"> 51 </span>$main:end:
+<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L53" class="LineNr"> 53 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L54" class="LineNr"> 54 </span>  b8/copy-to-EAX  1/imm32
+<span id="L55" class="LineNr"> 55 </span>  cd/syscall  0x80/imm8
+<span id="L56" class="LineNr"> 56 </span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment"># factorial(n)</span>
+<span id="L58" class="LineNr"> 58 </span>factorial:
+<span id="L59" class="LineNr"> 59 </span>  <span class="Comment"># prolog</span>
+<span id="L60" class="LineNr"> 60 </span>  55/push-EBP
+<span id="L61" class="LineNr"> 61 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L62" class="LineNr"> 62 </span>  53/push-EBX
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
+<span id="L64" class="LineNr"> 64 </span>  b8/copy-to-EAX  1/imm32
+<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
+<span id="L66" class="LineNr"> 66 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         1/imm32           <span class="Comment"># compare *(EBP+8)</span>
+<span id="L67" class="LineNr"> 67 </span>  7e/jump-if-&lt;=  $factorial:end/disp8
+<span id="L68" class="LineNr"> 68 </span>  <span class="Comment"># EBX = n-1</span>
+<span id="L69" class="LineNr"> 69 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
+<span id="L70" class="LineNr"> 70 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract from EBX</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># EAX = factorial(n-1)</span>
+<span id="L72" class="LineNr"> 72 </span>    <span class="Comment"># push args</span>
+<span id="L73" class="LineNr"> 73 </span>  53/push-EBX
+<span id="L74" class="LineNr"> 74 </span>    <span class="Comment"># call</span>
+<span id="L75" class="LineNr"> 75 </span>  e8/call  factorial/disp32
+<span id="L76" class="LineNr"> 76 </span>    <span class="Comment"># discard arg</span>
+<span id="L77" class="LineNr"> 77 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L79" class="LineNr"> 79 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(EBP+8) into EAX</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L81" class="LineNr"> 81 </span>$factorial:end:
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment"># epilog</span>
+<span id="L83" class="LineNr"> 83 </span>  5b/pop-to-EBX
+<span id="L84" class="LineNr"> 84 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L85" class="LineNr"> 85 </span>  5d/pop-to-EBP
+<span id="L86" class="LineNr"> 86 </span>  c3/return
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span>test-factorial:
+<span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># factorial(5)</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># push arg</span>
+<span id="L91" class="LineNr"> 91 </span>  68/push  5/imm32
+<span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># call</span>
+<span id="L93" class="LineNr"> 93 </span>  e8/call  factorial/disp32
+<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># discard arg</span>
+<span id="L95" class="LineNr"> 95 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># check-ints-equal(EAX, 120, failure message)</span>
+<span id="L97" class="LineNr"> 97 </span>    <span class="Comment"># push args</span>
+<span id="L98" class="LineNr"> 98 </span>  68/push  &quot;F - test-factorial&quot;/imm32
+<span id="L99" class="LineNr"> 99 </span>  68/push  0x78/imm32/expected-120
+<span id="L100" class="LineNr">100 </span>  50/push-EAX
+<span id="L101" class="LineNr">101 </span>    <span class="Comment"># call</span>
+<span id="L102" class="LineNr">102 </span>  e8/call  check-ints-equal/disp32
+<span id="L103" class="LineNr">103 </span>    <span class="Comment"># discard args</span>
+<span id="L104" class="LineNr">104 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Comment"># end</span>
+<span id="L106" class="LineNr">106 </span>  c3/return
+<span id="L107" class="LineNr">107 </span>
+<span id="L108" class="LineNr">108 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex1.subx.html b/html/subx/examples/ex1.subx.html
index 2718523c..df3bcacb 100644
--- a/html/subx/examples/ex1.subx.html
+++ b/html/subx/examples/ex1.subx.html
@@ -6,17 +6,16 @@
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -65,15 +64,12 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
 <span id="L11" class="LineNr">11 </span>== code
-<span id="L12" class="LineNr">12 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2a/imm32          <span class="Comment"># copy 42 to EBX</span>
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L17" class="LineNr">17 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L18" class="LineNr">18 </span>  cd/syscall  0x80/imm8
-<span id="L19" class="LineNr">19 </span>
-<span id="L20" class="LineNr">20 </span><span class="Comment"># vim&#0058;ft=subx</span>
+<span id="L12" class="LineNr">12 </span>bb/copy-to-EBX  2a/imm32
+<span id="L13" class="LineNr">13 </span><span class="Comment"># exit(EBX)</span>
+<span id="L14" class="LineNr">14 </span>b8/copy-to-EAX  1/imm32
+<span id="L15" class="LineNr">15 </span>cd/syscall  0x80/imm8
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span><span class="Comment"># 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 074cd0e8..ed2d959b 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.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">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
@@ -68,7 +68,7 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L14" class="LineNr">14 </span>
-<span id="L15" class="LineNr">15 </span><span class="Comment"># main: return argv_equal(argv[1], argv[2])</span>
+<span id="L15" class="LineNr">15 </span><span class="Comment"># main: return argv-equal(argv[1], argv[2])</span>
 <span id="L16" class="LineNr">16 </span><span class="Comment">#       At the start of a SubX program:</span>
 <span id="L17" class="LineNr">17 </span><span class="Comment">#         argc: *ESP</span>
 <span id="L18" class="LineNr">18 </span><span class="Comment">#         argv[0]: *(ESP+4)</span>
@@ -76,53 +76,56 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span><span class="Comment">#         ...</span>
 <span id="L21" class="LineNr">21 </span>  <span class="Comment"># prolog</span>
 <span id="L22" class="LineNr">22 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call argv_equal(argv[1], argv[2])</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call argv-equal(argv[1], argv[2])</span>
 <span id="L24" class="LineNr">24 </span>    <span class="Comment"># push argv[2]</span>
 <span id="L25" class="LineNr">25 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># push argv[1]</span>
 <span id="L27" class="LineNr">27 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># call</span>
-<span id="L29" class="LineNr">29 </span>  e8/call argv_equal/disp32
+<span id="L29" class="LineNr">29 </span>  e8/call argv-equal/disp32
 <span id="L30" class="LineNr">30 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L31" class="LineNr">31 </span>$exit:
 <span id="L32" class="LineNr">32 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L33" class="LineNr">33 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
+<span id="L33" class="LineNr">33 </span>  b8/copy-to-EAX  1/imm32
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
 <span id="L35" class="LineNr">35 </span>
 <span id="L36" class="LineNr">36 </span><span class="Comment"># compare two null-terminated ascii strings</span>
 <span id="L37" class="LineNr">37 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L38" class="LineNr">38 </span>argv_equal:  <span class="Comment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
+<span id="L38" class="LineNr">38 </span>argv-equal:  <span class="Comment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Comment"># initialize s1 (ECX) and s2 (EDX)</span>
 <span id="L40" class="LineNr">40 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
 <span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EDX</span>
 <span id="L42" class="LineNr">42 </span>  <span class="Comment"># while (true)</span>
-<span id="L43" class="LineNr">43 </span>$argv_loop:
+<span id="L43" class="LineNr">43 </span>$argv-equal:loop:
 <span id="L44" class="LineNr">44 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s1, *s2</span>
-<span id="L45" class="LineNr">45 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L45" class="LineNr">45 </span>  b8/copy-to-EAX  0/imm32
 <span id="L46" class="LineNr">46 </span>  8a/copy                         0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ECX to lower byte of EAX</span>
-<span id="L47" class="LineNr">47 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
+<span id="L47" class="LineNr">47 </span>  bb/copy-to-EBX  0/imm32
 <span id="L48" class="LineNr">48 </span>  8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDX to lower byte of EBX</span>
 <span id="L49" class="LineNr">49 </span>    <span class="Comment"># if (c1 == 0) break</span>
 <span id="L50" class="LineNr">50 </span>  3d/compare-EAX  0/imm32
-<span id="L51" class="LineNr">51 </span>  74/jump-if-equal  $argv_break/disp8
+<span id="L51" class="LineNr">51 </span>  74/jump-if-equal  $argv-equal:break/disp8
 <span id="L52" class="LineNr">52 </span>    <span class="Comment"># if (c1 != c2) return false</span>
 <span id="L53" class="LineNr">53 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
-<span id="L54" class="LineNr">54 </span>  75/jump-if-not-equal  $argv_fail/disp8
+<span id="L54" class="LineNr">54 </span>  75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L55" class="LineNr">55 </span>    <span class="Comment"># ++s1, ++s2</span>
 <span id="L56" class="LineNr">56 </span>  41/inc-ECX
 <span id="L57" class="LineNr">57 </span>  42/inc-EDX
 <span id="L58" class="LineNr">58 </span>  <span class="Comment"># end while</span>
-<span id="L59" class="LineNr">59 </span>  eb/jump  $argv_loop/disp8
-<span id="L60" class="LineNr">60 </span>$argv_break:
+<span id="L59" class="LineNr">59 </span>  eb/jump  $argv-equal:loop/disp8
+<span id="L60" class="LineNr">60 </span>$argv-equal:break:
 <span id="L61" class="LineNr">61 </span>  <span class="Comment"># if (c2 == 0) return true</span>
 <span id="L62" class="LineNr">62 </span>  81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EBX</span>
-<span id="L63" class="LineNr">63 </span>  75/jump-if-not-equal  $argv_fail/disp8
-<span id="L64" class="LineNr">64 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L65" class="LineNr">65 </span>  c3/return
-<span id="L66" class="LineNr">66 </span>  <span class="Comment"># return false</span>
-<span id="L67" class="LineNr">67 </span>$argv_fail:
-<span id="L68" class="LineNr">68 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L69" class="LineNr">69 </span>  c3/return
+<span id="L63" class="LineNr">63 </span>  75/jump-if-not-equal  $argv-equal:false/disp8
+<span id="L64" class="LineNr">64 </span>$argv-equal:success:
+<span id="L65" class="LineNr">65 </span>  b8/copy-to-EAX  1/imm32
+<span id="L66" class="LineNr">66 </span>  c3/return
+<span id="L67" class="LineNr">67 </span>  <span class="Comment"># return false</span>
+<span id="L68" class="LineNr">68 </span>$argv-equal:false:
+<span id="L69" class="LineNr">69 </span>  b8/copy-to-EAX  0/imm32
+<span id="L70" class="LineNr">70 </span>  c3/return
+<span id="L71" class="LineNr">71 </span>
+<span id="L72" class="LineNr">72 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index 3273b21a..1cab461e 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -77,15 +77,15 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </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="L22" class="LineNr"> 22 </span>
 <span id="L23" class="LineNr"> 23 </span><span class="Comment"># main:</span>
-<span id="L24" class="LineNr"> 24 </span>  e8/call  run_tests/disp32  <span class="Comment"># 'run_tests' is a function created automatically by SubX. It calls all functions that start with 'test_'.</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L24" class="LineNr"> 24 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># syscall(exit, EAX)</span>
 <span id="L26" class="LineNr"> 26 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L27" class="LineNr"> 27 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
+<span id="L27" class="LineNr"> 27 </span>  b8/copy-to-EAX  1/imm32
 <span id="L28" class="LineNr"> 28 </span>  cd/syscall  0x80/imm8
 <span id="L29" class="LineNr"> 29 </span>
 <span id="L30" class="LineNr"> 30 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L32" class="LineNr"> 32 </span>kernel_string_equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L32" class="LineNr"> 32 </span>kernel-string-equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Comment"># prolog</span>
 <span id="L34" class="LineNr"> 34 </span>  55/push-EBP
 <span id="L35" class="LineNr"> 35 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
@@ -118,291 +118,292 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
 <span id="L63" class="LineNr"> 63 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESI</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
-<span id="L65" class="LineNr"> 65 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32/exit      <span class="Comment"># copy to ECX</span>
+<span id="L65" class="LineNr"> 65 </span>  b9/copy-to-ECX  0/imm32/exit
 <span id="L66" class="LineNr"> 66 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
-<span id="L67" class="LineNr"> 67 </span>$kernel_string_loop:
+<span id="L67" class="LineNr"> 67 </span>$kernel-string-equal:loop:
 <span id="L68" class="LineNr"> 68 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
-<span id="L69" class="LineNr"> 69 </span>  74/jump-if-equal  $kernel_string_break/disp8
+<span id="L69" class="LineNr"> 69 </span>  74/jump-if-equal  $kernel-string-equal:break/disp8
 <span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
-<span id="L71" class="LineNr"> 71 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L71" class="LineNr"> 71 </span>  b8/copy-to-EAX  0/imm32
 <span id="L72" class="LineNr"> 72 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
-<span id="L73" class="LineNr"> 73 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
+<span id="L73" class="LineNr"> 73 </span>  bb/copy-to-EBX  0/imm32
 <span id="L74" class="LineNr"> 74 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># if (c1 == 0) return false</span>
 <span id="L76" class="LineNr"> 76 </span>  3d/compare-EAX  0/imm32
-<span id="L77" class="LineNr"> 77 </span>  74/jump-if-equal  $kernel_string_fail/disp8
+<span id="L77" class="LineNr"> 77 </span>  74/jump-if-equal  $kernel-string-equal:false/disp8
 <span id="L78" class="LineNr"> 78 </span>    <span class="Comment"># if (c1 != c2) return false</span>
 <span id="L79" class="LineNr"> 79 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
-<span id="L80" class="LineNr"> 80 </span>  75/jump-if-not-equal  $kernel_string_fail/disp8
+<span id="L80" class="LineNr"> 80 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L81" class="LineNr"> 81 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
 <span id="L82" class="LineNr"> 82 </span>  41/inc-ECX
 <span id="L83" class="LineNr"> 83 </span>  46/inc-ESI
 <span id="L84" class="LineNr"> 84 </span>  47/inc-EDI
 <span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># end while</span>
-<span id="L86" class="LineNr"> 86 </span>  eb/jump  $kernel_string_loop/disp8
-<span id="L87" class="LineNr"> 87 </span>$kernel_string_break:
+<span id="L86" class="LineNr"> 86 </span>  eb/jump  $kernel-string-equal:loop/disp8
+<span id="L87" class="LineNr"> 87 </span>$kernel-string-equal:break:
 <span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
-<span id="L89" class="LineNr"> 89 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L89" class="LineNr"> 89 </span>  b8/copy-to-EAX  0/imm32
 <span id="L90" class="LineNr"> 90 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
 <span id="L91" class="LineNr"> 91 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EAX</span>
-<span id="L92" class="LineNr"> 92 </span>  75/jump-if-not-equal  $kernel_string_fail/disp8
-<span id="L93" class="LineNr"> 93 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L94" class="LineNr"> 94 </span>  eb/jump  $kernel_string_end/disp8
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># return false</span>
-<span id="L96" class="LineNr"> 96 </span>$kernel_string_fail:
-<span id="L97" class="LineNr"> 97 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L98" class="LineNr"> 98 </span>
-<span id="L99" class="LineNr"> 99 </span>$kernel_string_end:
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># restore registers</span>
-<span id="L101" class="LineNr">101 </span>  5f/pop-to-EDI
-<span id="L102" class="LineNr">102 </span>  5e/pop-to-ESI
-<span id="L103" class="LineNr">103 </span>  5b/pop-to-EBX
-<span id="L104" class="LineNr">104 </span>  5a/pop-to-EDX
-<span id="L105" class="LineNr">105 </span>  59/pop-to-ECX
-<span id="L106" class="LineNr">106 </span>  <span class="Comment"># end</span>
-<span id="L107" class="LineNr">107 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L108" class="LineNr">108 </span>  5d/pop-to-EBP
-<span id="L109" class="LineNr">109 </span>  c3/return
-<span id="L110" class="LineNr">110 </span>
-<span id="L111" class="LineNr">111 </span><span class="SalientComment">## tests</span>
-<span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span>test_compare_null_kernel_string_with_empty_array:
-<span id="L114" class="LineNr">114 </span>  <span class="Comment"># EAX = kernel_string_equal(Null_kernel_string, &quot;&quot;)</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># push args</span>
-<span id="L116" class="LineNr">116 </span>  68/push  &quot;&quot;/imm32
-<span id="L117" class="LineNr">117 </span>  68/push  Null_kernel_string/imm32
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># call</span>
-<span id="L119" class="LineNr">119 </span>  e8/call  kernel_string_equal/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="Comment"># discard args</span>
-<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># call check_ints_equal(EAX, 1, msg)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># push args</span>
-<span id="L124" class="LineNr">124 </span>  68/push  &quot;F - test_compare_null_kernel_string_with_empty_array&quot;/imm32
-<span id="L125" class="LineNr">125 </span>  68/push  1/imm32/true
-<span id="L126" class="LineNr">126 </span>  50/push-EAX
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># call</span>
-<span id="L128" class="LineNr">128 </span>  e8/call  check_ints_equal/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="Comment"># discard args</span>
-<span id="L130" class="LineNr">130 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L131" class="LineNr">131 </span>  c3/return
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span>test_compare_null_kernel_string_with_non_empty_array:
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># EAX = kernel_string_equal(Null_kernel_string, &quot;Abc&quot;)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># push args</span>
-<span id="L136" class="LineNr">136 </span>  68/push  &quot;Abc&quot;/imm32
-<span id="L137" class="LineNr">137 </span>  68/push  Null_kernel_string/imm32
-<span id="L138" class="LineNr">138 </span>    <span class="Comment"># call</span>
-<span id="L139" class="LineNr">139 </span>  e8/call  kernel_string_equal/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># discard args</span>
-<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment"># call check_ints_equal(EAX, 0, msg)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># push args</span>
-<span id="L144" class="LineNr">144 </span>  68/push  &quot;F - test_compare_null_kernel_string_with_non_empty_array&quot;/imm32
-<span id="L145" class="LineNr">145 </span>  68/push  0/imm32/false
-<span id="L146" class="LineNr">146 </span>  50/push-EAX
-<span id="L147" class="LineNr">147 </span>    <span class="Comment"># call</span>
-<span id="L148" class="LineNr">148 </span>  e8/call  check_ints_equal/disp32
-<span id="L149" class="LineNr">149 </span>    <span class="Comment"># discard args</span>
-<span id="L150" class="LineNr">150 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L151" class="LineNr">151 </span>  c3/return
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span>test_compare_kernel_string_with_equal_array:
-<span id="L154" class="LineNr">154 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Abc&quot;)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># push args</span>
-<span id="L156" class="LineNr">156 </span>  68/push  &quot;Abc&quot;/imm32
-<span id="L157" class="LineNr">157 </span>  68/push  Abc_kernel_string/imm32
-<span id="L158" class="LineNr">158 </span>    <span class="Comment"># call</span>
-<span id="L159" class="LineNr">159 </span>  e8/call  kernel_string_equal/disp32
-<span id="L160" class="LineNr">160 </span>    <span class="Comment"># discard args</span>
-<span id="L161" class="LineNr">161 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment"># call check_ints_equal(EAX, 1, msg)</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># push args</span>
-<span id="L164" class="LineNr">164 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L165" class="LineNr">165 </span>  68/push  1/imm32/true
-<span id="L166" class="LineNr">166 </span>  50/push-EAX
-<span id="L167" class="LineNr">167 </span>    <span class="Comment"># call</span>
-<span id="L168" class="LineNr">168 </span>  e8/call  check_ints_equal/disp32
-<span id="L169" class="LineNr">169 </span>    <span class="Comment"># discard args</span>
-<span id="L170" class="LineNr">170 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L171" class="LineNr">171 </span>  c3/return
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span>test_compare_kernel_string_with_inequal_array:
-<span id="L174" class="LineNr">174 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Adc&quot;)</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># push args</span>
-<span id="L176" class="LineNr">176 </span>  68/push  &quot;Adc&quot;/imm32
-<span id="L177" class="LineNr">177 </span>  68/push  Abc_kernel_string/imm32
-<span id="L178" class="LineNr">178 </span>    <span class="Comment"># call</span>
-<span id="L179" class="LineNr">179 </span>  e8/call  kernel_string_equal/disp32
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># discard args</span>
-<span id="L181" class="LineNr">181 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Comment"># call check_ints_equal(EAX, 0, msg)</span>
-<span id="L183" class="LineNr">183 </span>    <span class="Comment"># push args</span>
-<span id="L184" class="LineNr">184 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L185" class="LineNr">185 </span>  68/push  0/imm32/false
-<span id="L186" class="LineNr">186 </span>  50/push-EAX
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># call</span>
-<span id="L188" class="LineNr">188 </span>  e8/call  check_ints_equal/disp32
-<span id="L189" class="LineNr">189 </span>    <span class="Comment"># discard args</span>
-<span id="L190" class="LineNr">190 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L191" class="LineNr">191 </span>  c3/return
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span>test_compare_kernel_string_with_empty_array:
-<span id="L194" class="LineNr">194 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;&quot;)</span>
-<span id="L195" class="LineNr">195 </span>    <span class="Comment"># push args</span>
-<span id="L196" class="LineNr">196 </span>  68/push  &quot;&quot;/imm32
-<span id="L197" class="LineNr">197 </span>  68/push  Abc_kernel_string/imm32
-<span id="L198" class="LineNr">198 </span>    <span class="Comment"># call</span>
-<span id="L199" class="LineNr">199 </span>  e8/call  kernel_string_equal/disp32
-<span id="L200" class="LineNr">200 </span>    <span class="Comment"># discard args</span>
-<span id="L201" class="LineNr">201 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Comment"># push args</span>
-<span id="L204" class="LineNr">204 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L205" class="LineNr">205 </span>  68/push  0/imm32/false
-<span id="L206" class="LineNr">206 </span>  50/push-EAX
-<span id="L207" class="LineNr">207 </span>    <span class="Comment"># call</span>
-<span id="L208" class="LineNr">208 </span>  e8/call  check_ints_equal/disp32
-<span id="L209" class="LineNr">209 </span>    <span class="Comment"># discard args</span>
-<span id="L210" class="LineNr">210 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L211" class="LineNr">211 </span>  c3/return
-<span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span>test_compare_kernel_string_with_shorter_array:
-<span id="L214" class="LineNr">214 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Ab&quot;)</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Comment"># push args</span>
-<span id="L216" class="LineNr">216 </span>  68/push  &quot;Ab&quot;/imm32
-<span id="L217" class="LineNr">217 </span>  68/push  Abc_kernel_string/imm32
-<span id="L218" class="LineNr">218 </span>    <span class="Comment"># call</span>
-<span id="L219" class="LineNr">219 </span>  e8/call  kernel_string_equal/disp32
-<span id="L220" class="LineNr">220 </span>    <span class="Comment"># discard args</span>
-<span id="L221" class="LineNr">221 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Comment"># push args</span>
-<span id="L224" class="LineNr">224 </span>  68/push  &quot;F - test_compare_kernel_string_with_shorter_array&quot;/imm32
-<span id="L225" class="LineNr">225 </span>  68/push  0/imm32/false
-<span id="L226" class="LineNr">226 </span>  50/push-EAX
-<span id="L227" class="LineNr">227 </span>    <span class="Comment"># call</span>
-<span id="L228" class="LineNr">228 </span>  e8/call  check_ints_equal/disp32
-<span id="L229" class="LineNr">229 </span>    <span class="Comment"># discard args</span>
-<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L231" class="LineNr">231 </span>  c3/return
-<span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span>test_compare_kernel_string_with_longer_array:
-<span id="L234" class="LineNr">234 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Abcd&quot;)</span>
-<span id="L235" class="LineNr">235 </span>    <span class="Comment"># push args</span>
-<span id="L236" class="LineNr">236 </span>  68/push  &quot;Abcd&quot;/imm32
-<span id="L237" class="LineNr">237 </span>  68/push  Abc_kernel_string/imm32
-<span id="L238" class="LineNr">238 </span>    <span class="Comment"># call</span>
-<span id="L239" class="LineNr">239 </span>  e8/call  kernel_string_equal/disp32
-<span id="L240" class="LineNr">240 </span>    <span class="Comment"># discard args</span>
-<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L243" class="LineNr">243 </span>    <span class="Comment"># push args</span>
-<span id="L244" class="LineNr">244 </span>  68/push  &quot;F - test_compare_kernel_string_with_longer_array&quot;/imm32
-<span id="L245" class="LineNr">245 </span>  68/push  0/imm32/false
-<span id="L246" class="LineNr">246 </span>  50/push-EAX
-<span id="L247" class="LineNr">247 </span>    <span class="Comment"># call</span>
-<span id="L248" class="LineNr">248 </span>  e8/call  check_ints_equal/disp32
-<span id="L249" class="LineNr">249 </span>    <span class="Comment"># discard args</span>
-<span id="L250" class="LineNr">250 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L251" class="LineNr">251 </span>  c3/return
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="SalientComment">## helpers</span>
-<span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L256" class="LineNr">256 </span>check_ints_equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Comment"># prolog</span>
-<span id="L258" class="LineNr">258 </span>  55/push-EBP
-<span id="L259" class="LineNr">259 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Comment"># save registers</span>
-<span id="L261" class="LineNr">261 </span>  51/push-ECX
-<span id="L262" class="LineNr">262 </span>  53/push-EBX
-<span id="L263" class="LineNr">263 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
-<span id="L264" class="LineNr">264 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L265" class="LineNr">265 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Comment"># if EAX == b/EBX</span>
-<span id="L267" class="LineNr">267 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
-<span id="L268" class="LineNr">268 </span>  75/jump-if-unequal  $check_ints_equal:else/disp8
-<span id="L269" class="LineNr">269 </span>    <span class="Comment"># print('.')</span>
-<span id="L270" class="LineNr">270 </span>      <span class="Comment"># push args</span>
-<span id="L271" class="LineNr">271 </span>  68/push  &quot;.&quot;/imm32
-<span id="L272" class="LineNr">272 </span>      <span class="Comment"># call</span>
-<span id="L273" class="LineNr">273 </span>  e8/call  write_stderr/disp32
-<span id="L274" class="LineNr">274 </span>      <span class="Comment"># discard arg</span>
-<span id="L275" class="LineNr">275 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L276" class="LineNr">276 </span>    <span class="Comment"># return</span>
-<span id="L277" class="LineNr">277 </span>  eb/jump  $check_ints_equal:end/disp8
-<span id="L278" class="LineNr">278 </span>  <span class="Comment"># else:</span>
-<span id="L279" class="LineNr">279 </span>$check_ints_equal:else:
-<span id="L280" class="LineNr">280 </span>  <span class="Comment"># copy msg into ECX</span>
-<span id="L281" class="LineNr">281 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
-<span id="L282" class="LineNr">282 </span>    <span class="Comment"># print(ECX)</span>
-<span id="L283" class="LineNr">283 </span>      <span class="Comment"># push args</span>
-<span id="L284" class="LineNr">284 </span>  51/push-ECX
-<span id="L285" class="LineNr">285 </span>      <span class="Comment"># call</span>
-<span id="L286" class="LineNr">286 </span>  e8/call  write_stderr/disp32
-<span id="L287" class="LineNr">287 </span>      <span class="Comment"># discard arg</span>
-<span id="L288" class="LineNr">288 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L289" class="LineNr">289 </span>    <span class="Comment"># print newline</span>
-<span id="L290" class="LineNr">290 </span>      <span class="Comment"># push args</span>
-<span id="L291" class="LineNr">291 </span>  68/push  Newline/imm32
-<span id="L292" class="LineNr">292 </span>      <span class="Comment"># call</span>
-<span id="L293" class="LineNr">293 </span>  e8/call  write_stderr/disp32
-<span id="L294" class="LineNr">294 </span>      <span class="Comment"># discard arg</span>
-<span id="L295" class="LineNr">295 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L296" class="LineNr">296 </span>$check_ints_equal:end:
-<span id="L297" class="LineNr">297 </span>  <span class="Comment"># restore registers</span>
-<span id="L298" class="LineNr">298 </span>  5b/pop-to-EBX
-<span id="L299" class="LineNr">299 </span>  59/pop-to-ECX
-<span id="L300" class="LineNr">300 </span>  <span class="Comment"># end</span>
-<span id="L301" class="LineNr">301 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L302" class="LineNr">302 </span>  5d/pop-to-EBP
-<span id="L303" class="LineNr">303 </span>  c3/return
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Comment"># prolog</span>
-<span id="L307" class="LineNr">307 </span>  55/push-EBP
-<span id="L308" class="LineNr">308 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Comment"># save registers</span>
-<span id="L310" class="LineNr">310 </span>  50/push-EAX
-<span id="L311" class="LineNr">311 </span>  51/push-ECX
-<span id="L312" class="LineNr">312 </span>  52/push-EDX
-<span id="L313" class="LineNr">313 </span>  53/push-EBX
-<span id="L314" class="LineNr">314 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
-<span id="L315" class="LineNr">315 </span>    <span class="Comment"># fd = 2 (stderr)</span>
-<span id="L316" class="LineNr">316 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L317" class="LineNr">317 </span>    <span class="Comment"># x = s+4</span>
-<span id="L318" class="LineNr">318 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
-<span id="L319" class="LineNr">319 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ECX</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Comment"># size = *s</span>
-<span id="L321" class="LineNr">321 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDX</span>
-<span id="L322" class="LineNr">322 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L323" class="LineNr">323 </span>    <span class="Comment"># call write()</span>
-<span id="L324" class="LineNr">324 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
-<span id="L325" class="LineNr">325 </span>  cd/syscall  0x80/imm8
-<span id="L326" class="LineNr">326 </span>  <span class="Comment"># restore registers</span>
-<span id="L327" class="LineNr">327 </span>  5b/pop-to-EBX
-<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>  58/pop-to-EAX
-<span id="L331" class="LineNr">331 </span>  <span class="Comment"># end</span>
-<span id="L332" class="LineNr">332 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="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>== data
-<span id="L337" class="LineNr">337 </span>Newline:
-<span id="L338" class="LineNr">338 </span>  <span class="Comment"># size</span>
-<span id="L339" class="LineNr">339 </span>  01 00 00 00
-<span id="L340" class="LineNr">340 </span>  <span class="Comment"># data</span>
-<span id="L341" class="LineNr">341 </span>  0a/newline
-<span id="L342" class="LineNr">342 </span>
-<span id="L343" class="LineNr">343 </span><span class="Comment"># for kernel_string_equal tests</span>
-<span id="L344" class="LineNr">344 </span>Null_kernel_string:
-<span id="L345" class="LineNr">345 </span>  00/null
-<span id="L346" class="LineNr">346 </span>Abc_kernel_string:
-<span id="L347" class="LineNr">347 </span>  41/A 62/b 63/c 00/null
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L92" class="LineNr"> 92 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
+<span id="L93" class="LineNr"> 93 </span>  b8/copy-to-EAX  1/imm32
+<span id="L94" class="LineNr"> 94 </span>$kernel-string-equal:true:
+<span id="L95" class="LineNr"> 95 </span>  eb/jump  $kernel-string-equal:end/disp8
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># return false</span>
+<span id="L97" class="LineNr"> 97 </span>$kernel-string-equal:false:
+<span id="L98" class="LineNr"> 98 </span>  b8/copy-to-EAX  0/imm32
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span>$kernel-string-equal:end:
+<span id="L101" class="LineNr">101 </span>  <span class="Comment"># restore registers</span>
+<span id="L102" class="LineNr">102 </span>  5f/pop-to-EDI
+<span id="L103" class="LineNr">103 </span>  5e/pop-to-ESI
+<span id="L104" class="LineNr">104 </span>  5b/pop-to-EBX
+<span id="L105" class="LineNr">105 </span>  5a/pop-to-EDX
+<span id="L106" class="LineNr">106 </span>  59/pop-to-ECX
+<span id="L107" class="LineNr">107 </span>  <span class="Comment"># end</span>
+<span id="L108" class="LineNr">108 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L109" class="LineNr">109 </span>  5d/pop-to-EBP
+<span id="L110" class="LineNr">110 </span>  c3/return
+<span id="L111" class="LineNr">111 </span>
+<span id="L112" class="LineNr">112 </span><span class="SalientComment">## tests</span>
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span>test-compare-null-kernel-string-with-empty-array:
+<span id="L115" class="LineNr">115 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Comment"># push args</span>
+<span id="L117" class="LineNr">117 </span>  68/push  &quot;&quot;/imm32
+<span id="L118" class="LineNr">118 </span>  68/push  Null-kernel-string/imm32
+<span id="L119" class="LineNr">119 </span>    <span class="Comment"># call</span>
+<span id="L120" class="LineNr">120 </span>  e8/call  kernel-string-equal/disp32
+<span id="L121" class="LineNr">121 </span>    <span class="Comment"># discard args</span>
+<span id="L122" class="LineNr">122 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Comment"># push args</span>
+<span id="L125" class="LineNr">125 </span>  68/push  &quot;F - test-compare-null-kernel-string-with-empty-array&quot;/imm32
+<span id="L126" class="LineNr">126 </span>  68/push  1/imm32/true
+<span id="L127" class="LineNr">127 </span>  50/push-EAX
+<span id="L128" class="LineNr">128 </span>    <span class="Comment"># call</span>
+<span id="L129" class="LineNr">129 </span>  e8/call  check-ints-equal/disp32
+<span id="L130" class="LineNr">130 </span>    <span class="Comment"># discard args</span>
+<span id="L131" class="LineNr">131 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L132" class="LineNr">132 </span>  c3/return
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span>test-compare-null-kernel-string-with-non-empty-array:
+<span id="L135" class="LineNr">135 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
+<span id="L136" class="LineNr">136 </span>    <span class="Comment"># push args</span>
+<span id="L137" class="LineNr">137 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L138" class="LineNr">138 </span>  68/push  Null-kernel-string/imm32
+<span id="L139" class="LineNr">139 </span>    <span class="Comment"># call</span>
+<span id="L140" class="LineNr">140 </span>  e8/call  kernel-string-equal/disp32
+<span id="L141" class="LineNr">141 </span>    <span class="Comment"># discard args</span>
+<span id="L142" class="LineNr">142 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Comment"># push args</span>
+<span id="L145" class="LineNr">145 </span>  68/push  &quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;/imm32
+<span id="L146" class="LineNr">146 </span>  68/push  0/imm32/false
+<span id="L147" class="LineNr">147 </span>  50/push-EAX
+<span id="L148" class="LineNr">148 </span>    <span class="Comment"># call</span>
+<span id="L149" class="LineNr">149 </span>  e8/call  check-ints-equal/disp32
+<span id="L150" class="LineNr">150 </span>    <span class="Comment"># discard args</span>
+<span id="L151" class="LineNr">151 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L152" class="LineNr">152 </span>  c3/return
+<span id="L153" class="LineNr">153 </span>
+<span id="L154" class="LineNr">154 </span>test-compare-kernel-string-with-equal-array:
+<span id="L155" class="LineNr">155 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
+<span id="L156" class="LineNr">156 </span>    <span class="Comment"># push args</span>
+<span id="L157" class="LineNr">157 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L158" class="LineNr">158 </span>  68/push  Abc-kernel-string/imm32
+<span id="L159" class="LineNr">159 </span>    <span class="Comment"># call</span>
+<span id="L160" class="LineNr">160 </span>  e8/call  kernel-string-equal/disp32
+<span id="L161" class="LineNr">161 </span>    <span class="Comment"># discard args</span>
+<span id="L162" class="LineNr">162 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L164" class="LineNr">164 </span>    <span class="Comment"># push args</span>
+<span id="L165" class="LineNr">165 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L166" class="LineNr">166 </span>  68/push  1/imm32/true
+<span id="L167" class="LineNr">167 </span>  50/push-EAX
+<span id="L168" class="LineNr">168 </span>    <span class="Comment"># call</span>
+<span id="L169" class="LineNr">169 </span>  e8/call  check-ints-equal/disp32
+<span id="L170" class="LineNr">170 </span>    <span class="Comment"># discard args</span>
+<span id="L171" class="LineNr">171 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L172" class="LineNr">172 </span>  c3/return
+<span id="L173" class="LineNr">173 </span>
+<span id="L174" class="LineNr">174 </span>test-compare-kernel-string-with-inequal-array:
+<span id="L175" class="LineNr">175 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
+<span id="L176" class="LineNr">176 </span>    <span class="Comment"># push args</span>
+<span id="L177" class="LineNr">177 </span>  68/push  &quot;Adc&quot;/imm32
+<span id="L178" class="LineNr">178 </span>  68/push  Abc-kernel-string/imm32
+<span id="L179" class="LineNr">179 </span>    <span class="Comment"># call</span>
+<span id="L180" class="LineNr">180 </span>  e8/call  kernel-string-equal/disp32
+<span id="L181" class="LineNr">181 </span>    <span class="Comment"># discard args</span>
+<span id="L182" class="LineNr">182 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L184" class="LineNr">184 </span>    <span class="Comment"># push args</span>
+<span id="L185" class="LineNr">185 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L186" class="LineNr">186 </span>  68/push  0/imm32/false
+<span id="L187" class="LineNr">187 </span>  50/push-EAX
+<span id="L188" class="LineNr">188 </span>    <span class="Comment"># call</span>
+<span id="L189" class="LineNr">189 </span>  e8/call  check-ints-equal/disp32
+<span id="L190" class="LineNr">190 </span>    <span class="Comment"># discard args</span>
+<span id="L191" class="LineNr">191 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L192" class="LineNr">192 </span>  c3/return
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span>test-compare-kernel-string-with-empty-array:
+<span id="L195" class="LineNr">195 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
+<span id="L196" class="LineNr">196 </span>    <span class="Comment"># push args</span>
+<span id="L197" class="LineNr">197 </span>  68/push  &quot;&quot;/imm32
+<span id="L198" class="LineNr">198 </span>  68/push  Abc-kernel-string/imm32
+<span id="L199" class="LineNr">199 </span>    <span class="Comment"># call</span>
+<span id="L200" class="LineNr">200 </span>  e8/call  kernel-string-equal/disp32
+<span id="L201" class="LineNr">201 </span>    <span class="Comment"># discard args</span>
+<span id="L202" class="LineNr">202 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L204" class="LineNr">204 </span>    <span class="Comment"># push args</span>
+<span id="L205" class="LineNr">205 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L206" class="LineNr">206 </span>  68/push  0/imm32/false
+<span id="L207" class="LineNr">207 </span>  50/push-EAX
+<span id="L208" class="LineNr">208 </span>    <span class="Comment"># call</span>
+<span id="L209" class="LineNr">209 </span>  e8/call  check-ints-equal/disp32
+<span id="L210" class="LineNr">210 </span>    <span class="Comment"># discard args</span>
+<span id="L211" class="LineNr">211 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L212" class="LineNr">212 </span>  c3/return
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span>test-compare-kernel-string-with-shorter-array:
+<span id="L215" class="LineNr">215 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
+<span id="L216" class="LineNr">216 </span>    <span class="Comment"># push args</span>
+<span id="L217" class="LineNr">217 </span>  68/push  &quot;Ab&quot;/imm32
+<span id="L218" class="LineNr">218 </span>  68/push  Abc-kernel-string/imm32
+<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L220" class="LineNr">220 </span>  e8/call  kernel-string-equal/disp32
+<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
+<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L224" class="LineNr">224 </span>    <span class="Comment"># push args</span>
+<span id="L225" class="LineNr">225 </span>  68/push  &quot;F - test-compare-kernel-string-with-shorter-array&quot;/imm32
+<span id="L226" class="LineNr">226 </span>  68/push  0/imm32/false
+<span id="L227" class="LineNr">227 </span>  50/push-EAX
+<span id="L228" class="LineNr">228 </span>    <span class="Comment"># call</span>
+<span id="L229" class="LineNr">229 </span>  e8/call  check-ints-equal/disp32
+<span id="L230" class="LineNr">230 </span>    <span class="Comment"># discard args</span>
+<span id="L231" class="LineNr">231 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L232" class="LineNr">232 </span>  c3/return
+<span id="L233" class="LineNr">233 </span>
+<span id="L234" class="LineNr">234 </span>test-compare-kernel-string-with-longer-array:
+<span id="L235" class="LineNr">235 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
+<span id="L236" class="LineNr">236 </span>    <span class="Comment"># push args</span>
+<span id="L237" class="LineNr">237 </span>  68/push  &quot;Abcd&quot;/imm32
+<span id="L238" class="LineNr">238 </span>  68/push  Abc-kernel-string/imm32
+<span id="L239" class="LineNr">239 </span>    <span class="Comment"># call</span>
+<span id="L240" class="LineNr">240 </span>  e8/call  kernel-string-equal/disp32
+<span id="L241" class="LineNr">241 </span>    <span class="Comment"># discard args</span>
+<span id="L242" class="LineNr">242 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L244" class="LineNr">244 </span>    <span class="Comment"># push args</span>
+<span id="L245" class="LineNr">245 </span>  68/push  &quot;F - test-compare-kernel-string-with-longer-array&quot;/imm32
+<span id="L246" class="LineNr">246 </span>  68/push  0/imm32/false
+<span id="L247" class="LineNr">247 </span>  50/push-EAX
+<span id="L248" class="LineNr">248 </span>    <span class="Comment"># call</span>
+<span id="L249" class="LineNr">249 </span>  e8/call  check-ints-equal/disp32
+<span id="L250" class="LineNr">250 </span>    <span class="Comment"># discard args</span>
+<span id="L251" class="LineNr">251 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L252" class="LineNr">252 </span>  c3/return
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="SalientComment">## helpers</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L257" class="LineNr">257 </span>check-ints-equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Comment"># prolog</span>
+<span id="L259" class="LineNr">259 </span>  55/push-EBP
+<span id="L260" class="LineNr">260 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Comment"># save registers</span>
+<span id="L262" class="LineNr">262 </span>  51/push-ECX
+<span id="L263" class="LineNr">263 </span>  53/push-EBX
+<span id="L264" class="LineNr">264 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
+<span id="L265" class="LineNr">265 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L266" class="LineNr">266 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Comment"># if EAX == b/EBX</span>
+<span id="L268" class="LineNr">268 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L269" class="LineNr">269 </span>  75/jump-if-unequal  $check-ints-equal:else/disp8
+<span id="L270" class="LineNr">270 </span>    <span class="Comment"># print('.')</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Comment"># push args</span>
+<span id="L272" class="LineNr">272 </span>  68/push  &quot;.&quot;/imm32
+<span id="L273" class="LineNr">273 </span>      <span class="Comment"># call</span>
+<span id="L274" class="LineNr">274 </span>  e8/call  write-stderr/disp32
+<span id="L275" class="LineNr">275 </span>      <span class="Comment"># discard arg</span>
+<span id="L276" class="LineNr">276 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L277" class="LineNr">277 </span>    <span class="Comment"># return</span>
+<span id="L278" class="LineNr">278 </span>  eb/jump  $check-ints-equal:end/disp8
+<span id="L279" class="LineNr">279 </span>  <span class="Comment"># else:</span>
+<span id="L280" class="LineNr">280 </span>$check-ints-equal:else:
+<span id="L281" class="LineNr">281 </span>  <span class="Comment"># copy msg into ECX</span>
+<span id="L282" class="LineNr">282 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
+<span id="L283" class="LineNr">283 </span>    <span class="Comment"># print(ECX)</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Comment"># push args</span>
+<span id="L285" class="LineNr">285 </span>  51/push-ECX
+<span id="L286" class="LineNr">286 </span>      <span class="Comment"># call</span>
+<span id="L287" class="LineNr">287 </span>  e8/call  write-stderr/disp32
+<span id="L288" class="LineNr">288 </span>      <span class="Comment"># discard arg</span>
+<span id="L289" class="LineNr">289 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L290" class="LineNr">290 </span>    <span class="Comment"># print newline</span>
+<span id="L291" class="LineNr">291 </span>      <span class="Comment"># push args</span>
+<span id="L292" class="LineNr">292 </span>  68/push  Newline/imm32
+<span id="L293" class="LineNr">293 </span>      <span class="Comment"># call</span>
+<span id="L294" class="LineNr">294 </span>  e8/call  write-stderr/disp32
+<span id="L295" class="LineNr">295 </span>      <span class="Comment"># discard arg</span>
+<span id="L296" class="LineNr">296 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L297" class="LineNr">297 </span>$check-ints-equal:end:
+<span id="L298" class="LineNr">298 </span>  <span class="Comment"># restore registers</span>
+<span id="L299" class="LineNr">299 </span>  5b/pop-to-EBX
+<span id="L300" class="LineNr">300 </span>  59/pop-to-ECX
+<span id="L301" class="LineNr">301 </span>  <span class="Comment"># end</span>
+<span id="L302" class="LineNr">302 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L303" class="LineNr">303 </span>  5d/pop-to-EBP
+<span id="L304" class="LineNr">304 </span>  c3/return
+<span id="L305" class="LineNr">305 </span>
+<span id="L306" class="LineNr">306 </span>write-stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Comment"># prolog</span>
+<span id="L308" class="LineNr">308 </span>  55/push-EBP
+<span id="L309" class="LineNr">309 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Comment"># save registers</span>
+<span id="L311" class="LineNr">311 </span>  50/push-EAX
+<span id="L312" class="LineNr">312 </span>  51/push-ECX
+<span id="L313" class="LineNr">313 </span>  52/push-EDX
+<span id="L314" class="LineNr">314 </span>  53/push-EBX
+<span id="L315" class="LineNr">315 </span>  <span class="Comment"># syscall(write, 2/stderr, (data) s+4, (size) *s)</span>
+<span id="L316" class="LineNr">316 </span>    <span class="Comment"># fd = 2 (stderr)</span>
+<span id="L317" class="LineNr">317 </span>  bb/copy-to-EBX  2/imm32
+<span id="L318" class="LineNr">318 </span>    <span class="Comment"># x = s+4</span>
+<span id="L319" class="LineNr">319 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
+<span id="L320" class="LineNr">320 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ECX</span>
+<span id="L321" class="LineNr">321 </span>    <span class="Comment"># size = *s</span>
+<span id="L322" class="LineNr">322 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDX</span>
+<span id="L323" class="LineNr">323 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L324" class="LineNr">324 </span>    <span class="Comment"># syscall</span>
+<span id="L325" class="LineNr">325 </span>  b8/copy-to-EAX  4/imm32/write
+<span id="L326" class="LineNr">326 </span>  cd/syscall  0x80/imm8
+<span id="L327" class="LineNr">327 </span>  <span class="Comment"># restore registers</span>
+<span id="L328" class="LineNr">328 </span>  5b/pop-to-EBX
+<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>  58/pop-to-EAX
+<span id="L332" class="LineNr">332 </span>  <span class="Comment"># end</span>
+<span id="L333" class="LineNr">333 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L334" class="LineNr">334 </span>  5d/pop-to-EBP
+<span id="L335" class="LineNr">335 </span>  c3/return
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span>== data
+<span id="L338" class="LineNr">338 </span>Newline:
+<span id="L339" class="LineNr">339 </span>  <span class="Comment"># size</span>
+<span id="L340" class="LineNr">340 </span>  01 00 00 00
+<span id="L341" class="LineNr">341 </span>  <span class="Comment"># data</span>
+<span id="L342" class="LineNr">342 </span>  0a/newline
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Comment"># for kernel-string-equal tests</span>
+<span id="L345" class="LineNr">345 </span>Null-kernel-string:
+<span id="L346" class="LineNr">346 </span>  00/null
+<span id="L347" class="LineNr">347 </span>Abc-kernel-string:
+<span id="L348" class="LineNr">348 </span>  41/A 62/b 63/c 00/null
+<span id="L349" class="LineNr">349 </span>
+<span id="L350" class="LineNr">350 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex12.subx.html b/html/subx/examples/ex12.subx.html
index 93feff8c..b4ad239c 100644
--- a/html/subx/examples/ex12.subx.html
+++ b/html/subx/examples/ex12.subx.html
@@ -67,22 +67,22 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L12" class="LineNr">12 </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="L13" class="LineNr">13 </span>
-<span id="L14" class="LineNr">14 </span>  <span class="Comment"># mmap(0x1000)</span>
-<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              mmap_new_segment/imm32  <span class="Comment"># copy to EBX</span>
-<span id="L16" class="LineNr">16 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x5a/imm32/mmap         <span class="Comment"># copy to EAX</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Comment"># syscall(mmap, 0x1000)</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy-to-EBX  mmap-new-segment/imm32
+<span id="L16" class="LineNr">16 </span>  b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L17" class="LineNr">17 </span>  cd/syscall  0x80/imm8
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span>  <span class="Comment"># store to *EAX</span>
 <span id="L20" class="LineNr">20 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x34/imm32              <span class="Comment"># copy to *EAX</span>
 <span id="L21" class="LineNr">21 </span>
-<span id="L22" class="LineNr">22 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L22" class="LineNr">22 </span>  <span class="Comment"># syscall(exit, EAX)</span>
 <span id="L23" class="LineNr">23 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
-<span id="L24" class="LineNr">24 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy to EAX</span>
+<span id="L24" class="LineNr">24 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
 <span id="L26" class="LineNr">26 </span>
 <span id="L27" class="LineNr">27 </span>== data
 <span id="L28" class="LineNr">28 </span><span class="Comment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L29" class="LineNr">29 </span>mmap_new_segment:  <span class="Comment"># type mmap_arg_struct</span>
+<span id="L29" class="LineNr">29 </span>mmap-new-segment:  <span class="Comment"># type mmap_arg_struct</span>
 <span id="L30" class="LineNr">30 </span>  <span class="Comment"># addr</span>
 <span id="L31" class="LineNr">31 </span>  00 00 00 00  <span class="Comment"># null</span>
 <span id="L32" class="LineNr">32 </span>  <span class="Comment"># len</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr">40 </span>  <span class="Comment"># offset</span>
 <span id="L41" class="LineNr">41 </span>  00 00 00 00  <span class="Comment"># 0 since MAP_ANONYMOUS is specified</span>
 <span id="L42" class="LineNr">42 </span>
-<span id="L43" class="LineNr">43 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L43" class="LineNr">43 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex2.subx.html b/html/subx/examples/ex2.subx.html
index 81cce37f..640e0bdf 100644
--- a/html/subx/examples/ex2.subx.html
+++ b/html/subx/examples/ex2.subx.html
@@ -6,17 +6,16 @@
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
-<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
 <meta name="colorscheme" content="minimal">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -64,16 +63,13 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   2</span>
 <span id="L9" class="LineNr"> 9 </span>
 <span id="L10" class="LineNr">10 </span>== code
-<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L14" class="LineNr">14 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L15" class="LineNr">15 </span>  43/inc-EBX
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L17" class="LineNr">17 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L18" class="LineNr">18 </span>  cd/syscall  0x80/imm8
-<span id="L19" class="LineNr">19 </span>
-<span id="L20" class="LineNr">20 </span><span class="Comment"># vim&#0058;ft=subx</span>
+<span id="L11" class="LineNr">11 </span>bb/copy-to-EBX  1/imm32
+<span id="L12" class="LineNr">12 </span>43/inc-EBX
+<span id="L13" class="LineNr">13 </span><span class="Comment"># exit(EBX)</span>
+<span id="L14" class="LineNr">14 </span>b8/copy-to-EAX  1/imm32
+<span id="L15" class="LineNr">15 </span>cd/syscall  0x80/imm8
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex3.subx.html b/html/subx/examples/ex3.subx.html
index b6b6d21b..140d9224 100644
--- a/html/subx/examples/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -68,9 +68,9 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L14" class="LineNr">14 </span>  <span class="Comment"># result: EBX = 0</span>
-<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy-to-EBX  0/imm32
 <span id="L16" class="LineNr">16 </span>  <span class="Comment"># counter: ECX = 1</span>
-<span id="L17" class="LineNr">17 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to ECX</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy-to-ECX  1/imm32
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span>$loop:
 <span id="L20" class="LineNr">20 </span>  <span class="Comment"># while (counter &lt;= 10)</span>
@@ -85,10 +85,10 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr">29 </span>
 <span id="L30" class="LineNr">30 </span>$exit:
 <span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L32" class="LineNr">32 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
+<span id="L32" class="LineNr">32 </span>  b8/copy-to-EAX  1/imm32
 <span id="L33" class="LineNr">33 </span>  cd/syscall  0x80/imm8
 <span id="L34" class="LineNr">34 </span>
-<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index fda4338b..ba639cde 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -16,7 +16,6 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -61,41 +60,37 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex4</span>
 <span id="L6" class="LineNr"> 6 </span>
 <span id="L7" class="LineNr"> 7 </span>== code
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L11" class="LineNr">11 </span>
-<span id="L12" class="LineNr">12 </span>  <span class="Comment"># read(stdin, x, 1)</span>
-<span id="L13" class="LineNr">13 </span>    <span class="Comment"># fd = 0 (stdin)</span>
-<span id="L14" class="LineNr">14 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L15" class="LineNr">15 </span>    <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L16" class="LineNr">16 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              x/imm32           <span class="Comment"># copy to ECX</span>
-<span id="L17" class="LineNr">17 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L18" class="LineNr">18 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EDX</span>
-<span id="L19" class="LineNr">19 </span>    <span class="Comment"># read(fd, x, size)</span>
-<span id="L20" class="LineNr">20 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read      <span class="Comment"># copy to EAX</span>
-<span id="L21" class="LineNr">21 </span>  cd/syscall  0x80/imm8
-<span id="L22" class="LineNr">22 </span>
-<span id="L23" class="LineNr">23 </span>  <span class="Comment"># write(stdout, x, 1)</span>
-<span id="L24" class="LineNr">24 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L25" class="LineNr">25 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L26" class="LineNr">26 </span>    <span class="Comment"># initialize x (location to read from)</span>
-<span id="L27" class="LineNr">27 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              x/imm32           <span class="Comment"># copy to ECX</span>
-<span id="L28" class="LineNr">28 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L29" class="LineNr">29 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EDX</span>
-<span id="L30" class="LineNr">30 </span>    <span class="Comment"># write(fd, x, size)</span>
-<span id="L31" class="LineNr">31 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
-<span id="L32" class="LineNr">32 </span>  cd/syscall  0x80/imm8
+<span id="L8" class="LineNr"> 8 </span><span class="Comment"># syscall(read, stdin, x, 1)</span>
+<span id="L9" class="LineNr"> 9 </span>  <span class="Comment"># fd = 0 (stdin)</span>
+<span id="L10" class="LineNr">10 </span>bb/copy-to-EBX  0/imm32
+<span id="L11" class="LineNr">11 </span>  <span class="Comment"># initialize x (location to write result to)</span>
+<span id="L12" class="LineNr">12 </span>b9/copy-to-ECX  x/imm32
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L14" class="LineNr">14 </span>ba/copy-to-EDX  1/imm32
+<span id="L15" class="LineNr">15 </span>  <span class="Comment"># syscall</span>
+<span id="L16" class="LineNr">16 </span>b8/copy-to-EAX  3/imm32/read
+<span id="L17" class="LineNr">17 </span>cd/syscall  0x80/imm8
+<span id="L18" class="LineNr">18 </span>
+<span id="L19" class="LineNr">19 </span><span class="Comment"># syscall(write, stdout, x, 1)</span>
+<span id="L20" class="LineNr">20 </span>  <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L21" class="LineNr">21 </span>bb/copy-to-EBX  1/imm32
+<span id="L22" class="LineNr">22 </span>  <span class="Comment"># initialize x (location to read from)</span>
+<span id="L23" class="LineNr">23 </span>b9/copy-to-ECX  x/imm32
+<span id="L24" class="LineNr">24 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L25" class="LineNr">25 </span>ba/copy-to-EDX  1/imm32
+<span id="L26" class="LineNr">26 </span>  <span class="Comment"># syscall</span>
+<span id="L27" class="LineNr">27 </span>b8/copy-to-EAX  4/imm32/write
+<span id="L28" class="LineNr">28 </span>cd/syscall  0x80/imm8
+<span id="L29" class="LineNr">29 </span>
+<span id="L30" class="LineNr">30 </span><span class="Comment"># syscall(exit, EBX)</span>
+<span id="L31" class="LineNr">31 </span>b8/copy-to-EAX  1/imm32/exit
+<span id="L32" class="LineNr">32 </span>cd/syscall  0x80/imm8
 <span id="L33" class="LineNr">33 </span>
-<span id="L34" class="LineNr">34 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L35" class="LineNr">35 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
-<span id="L36" class="LineNr">36 </span>  cd/syscall  0x80/imm8
+<span id="L34" class="LineNr">34 </span>== data
+<span id="L35" class="LineNr">35 </span>x:
+<span id="L36" class="LineNr">36 </span>  00 00 00 00  <span class="Comment"># space for read() to write to</span>
 <span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>== data
-<span id="L39" class="LineNr">39 </span>x:
-<span id="L40" class="LineNr">40 </span>  00 00 00 00  <span class="Comment"># space for read() to write to</span>
-<span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L38" class="LineNr">38 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index 4392d9e2..bc727faf 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -69,33 +69,33 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span>  <span class="Comment"># allocate x on the stack</span>
 <span id="L14" class="LineNr">14 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># subtract from ESP</span>
 <span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># read(stdin, x, 1)</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># syscall(read, stdin, x, 1)</span>
 <span id="L17" class="LineNr">17 </span>    <span class="Comment"># fd = 0 (stdin)</span>
-<span id="L18" class="LineNr">18 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L18" class="LineNr">18 </span>  bb/copy-to-EBX  0/imm32
 <span id="L19" class="LineNr">19 </span>    <span class="Comment"># initialize x (location to write result to)</span>
 <span id="L20" class="LineNr">20 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
 <span id="L21" class="LineNr">21 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L22" class="LineNr">22 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EDX</span>
-<span id="L23" class="LineNr">23 </span>    <span class="Comment"># read(fd, x, size)</span>
-<span id="L24" class="LineNr">24 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read      <span class="Comment"># copy to EAX</span>
+<span id="L22" class="LineNr">22 </span>  ba/copy-to-EDX  1/imm32
+<span id="L23" class="LineNr">23 </span>    <span class="Comment"># syscall</span>
+<span id="L24" class="LineNr">24 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
 <span id="L26" class="LineNr">26 </span>
-<span id="L27" class="LineNr">27 </span>  <span class="Comment"># write(stdout, x, 1)</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Comment"># syscall(write, stdout, x, 1)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L29" class="LineNr">29 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L29" class="LineNr">29 </span>  bb/copy-to-EBX  1/imm32
 <span id="L30" class="LineNr">30 </span>    <span class="Comment"># initialize x (location to read from)</span>
 <span id="L31" class="LineNr">31 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L33" class="LineNr">33 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EDX</span>
-<span id="L34" class="LineNr">34 </span>    <span class="Comment"># write(fd, x, size)</span>
-<span id="L35" class="LineNr">35 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
+<span id="L33" class="LineNr">33 </span>  ba/copy-to-EDX  1/imm32
+<span id="L34" class="LineNr">34 </span>    <span class="Comment"># syscall</span>
+<span id="L35" class="LineNr">35 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L36" class="LineNr">36 </span>  cd/syscall  0x80/imm8
 <span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L39" class="LineNr">39 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
+<span id="L38" class="LineNr">38 </span>  <span class="Comment"># syscall(exit, EBX)</span>
+<span id="L39" class="LineNr">39 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L40" class="LineNr">40 </span>  cd/syscall  0x80/imm8
 <span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index ef41ba15..5df92a48 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -66,19 +66,19 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L11" class="LineNr">11 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L12" class="LineNr">12 </span>
-<span id="L13" class="LineNr">13 </span>  <span class="Comment"># write(stdout, x, size)</span>
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># syscall(write, stdout, x, size)</span>
 <span id="L14" class="LineNr">14 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy-to-EBX  1/imm32
 <span id="L16" class="LineNr">16 </span>    <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L17" class="LineNr">17 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              x/imm32           <span class="Comment"># copy to ECX</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy-to-ECX  x/imm32
 <span id="L18" class="LineNr">18 </span>    <span class="Comment"># initialize size</span>
 <span id="L19" class="LineNr">19 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   size/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy *size to EDX</span>
-<span id="L20" class="LineNr">20 </span>    <span class="Comment"># write(fd, x, size)</span>
-<span id="L21" class="LineNr">21 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
+<span id="L20" class="LineNr">20 </span>    <span class="Comment"># syscall</span>
+<span id="L21" class="LineNr">21 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L22" class="LineNr">22 </span>  cd/syscall  0x80/imm8
 <span id="L23" class="LineNr">23 </span>
-<span id="L24" class="LineNr">24 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L25" class="LineNr">25 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
+<span id="L24" class="LineNr">24 </span>  <span class="Comment"># syscall(exit, EBX)</span>
+<span id="L25" class="LineNr">25 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L26" class="LineNr">26 </span>  cd/syscall  0x80/imm8
 <span id="L27" class="LineNr">27 </span>
 <span id="L28" class="LineNr">28 </span>== data
@@ -88,7 +88,7 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr">32 </span>  48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
 <span id="L33" class="LineNr">33 </span><span class="Comment"># H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
 <span id="L34" class="LineNr">34 </span>
-<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
index d5ef4a99..3ffc6a49 100644
--- a/html/subx/examples/ex7.subx.html
+++ b/html/subx/examples/ex7.subx.html
@@ -71,79 +71,79 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L16" class="LineNr"> 16 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L17" class="LineNr"> 17 </span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Comment"># creat(filename)</span>
-<span id="L19" class="LineNr"> 19 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L20" class="LineNr"> 20 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy to ECX</span>
-<span id="L21" class="LineNr"> 21 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32/creat           <span class="Comment"># copy to EAX</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Comment"># syscall(creat, filename)</span>
+<span id="L19" class="LineNr"> 19 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L20" class="LineNr"> 20 </span>  b9/copy-to-ECX  0x180/imm32/fixed-perms
+<span id="L21" class="LineNr"> 21 </span>  b8/copy-to-EAX  8/imm32/creat
 <span id="L22" class="LineNr"> 22 </span>  cd/syscall  0x80/imm8
 <span id="L23" class="LineNr"> 23 </span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># stream = open(filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</span>
-<span id="L25" class="LineNr"> 25 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L26" class="LineNr"> 26 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/wronly          <span class="Comment"># copy to ECX</span>
-<span id="L27" class="LineNr"> 27 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy to EDX</span>
-<span id="L28" class="LineNr"> 28 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32/open            <span class="Comment"># copy to EAX</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># stream = syscall(open, filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</span>
+<span id="L25" class="LineNr"> 25 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L26" class="LineNr"> 26 </span>  b9/copy-to-ECX  1/imm32/wronly
+<span id="L27" class="LineNr"> 27 </span>  ba/copy-to-EDX  0x180/imm32/fixed-perms
+<span id="L28" class="LineNr"> 28 </span>  b8/copy-to-EAX  5/imm32/open
 <span id="L29" class="LineNr"> 29 </span>  cd/syscall  0x80/imm8
 <span id="L30" class="LineNr"> 30 </span>    <span class="Comment"># save stream</span>
-<span id="L31" class="LineNr"> 31 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
+<span id="L31" class="LineNr"> 31 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *EBX</span>
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># write(stream, &quot;a&quot;, 1)</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># syscall(write, stream, &quot;a&quot;, 1)</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="Comment"># load stream</span>
-<span id="L36" class="LineNr"> 36 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L36" class="LineNr"> 36 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="Comment">#</span>
-<span id="L39" class="LineNr"> 39 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              a/imm32                 <span class="Comment"># copy to ECX</span>
-<span id="L40" class="LineNr"> 40 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/size            <span class="Comment"># copy to EDX</span>
-<span id="L41" class="LineNr"> 41 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write           <span class="Comment"># copy to EAX</span>
+<span id="L39" class="LineNr"> 39 </span>  b9/copy-to-ECX  a/imm32
+<span id="L40" class="LineNr"> 40 </span>  ba/copy-to-EDX  1/imm32/size
+<span id="L41" class="LineNr"> 41 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L42" class="LineNr"> 42 </span>  cd/syscall  0x80/imm8
 <span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># close(stream)</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># syscall(close, stream)</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># load stream</span>
-<span id="L46" class="LineNr"> 46 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L46" class="LineNr"> 46 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Comment">#</span>
-<span id="L49" class="LineNr"> 49 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              6/imm32/close           <span class="Comment"># copy to EAX</span>
+<span id="L49" class="LineNr"> 49 </span>  b8/copy-to-EAX  6/imm32/close
 <span id="L50" class="LineNr"> 50 </span>  cd/syscall  0x80/imm8
 <span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># stream = open(filename, O_RDONLY, 0)</span>
-<span id="L53" class="LineNr"> 53 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L54" class="LineNr"> 54 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32/rdonly          <span class="Comment"># copy to ECX</span>
-<span id="L55" class="LineNr"> 55 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x180/imm32/fixed-perms <span class="Comment"># copy to EDX</span>
-<span id="L56" class="LineNr"> 56 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              5/imm32/open            <span class="Comment"># copy to EAX</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># stream = syscall(open, filename, O_RDONLY, 0)</span>
+<span id="L53" class="LineNr"> 53 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L54" class="LineNr"> 54 </span>  b9/copy-to-ECX  0/imm32/rdonly
+<span id="L55" class="LineNr"> 55 </span>  ba/copy-to-EDX  0x180/imm32/fixed-perms
+<span id="L56" class="LineNr"> 56 </span>  b8/copy-to-EAX  5/imm32/open
 <span id="L57" class="LineNr"> 57 </span>  cd/syscall  0x80/imm8
 <span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># save stream</span>
-<span id="L59" class="LineNr"> 59 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
+<span id="L59" class="LineNr"> 59 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *EBX</span>
 <span id="L61" class="LineNr"> 61 </span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># read(stream, b, 1)</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># syscall(read, stream, b, 1)</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># load stream</span>
-<span id="L64" class="LineNr"> 64 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L64" class="LineNr"> 64 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L66" class="LineNr"> 66 </span>    <span class="Comment">#</span>
-<span id="L67" class="LineNr"> 67 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              b/imm32                 <span class="Comment"># copy to ECX</span>
-<span id="L68" class="LineNr"> 68 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/size            <span class="Comment"># copy to EDX</span>
-<span id="L69" class="LineNr"> 69 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read            <span class="Comment"># copy to EAX</span>
+<span id="L67" class="LineNr"> 67 </span>  b9/copy-to-ECX  b/imm32
+<span id="L68" class="LineNr"> 68 </span>  ba/copy-to-EDX  1/imm32/size
+<span id="L69" class="LineNr"> 69 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L70" class="LineNr"> 70 </span>  cd/syscall  0x80/imm8
 <span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># close(stream)</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># syscall(close, stream)</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># load stream</span>
-<span id="L74" class="LineNr"> 74 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L74" class="LineNr"> 74 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L76" class="LineNr"> 76 </span>    <span class="Comment">#</span>
-<span id="L77" class="LineNr"> 77 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              6/imm32/close           <span class="Comment"># copy to EAX</span>
+<span id="L77" class="LineNr"> 77 </span>  b8/copy-to-EAX  6/imm32/close
 <span id="L78" class="LineNr"> 78 </span>  cd/syscall  0x80/imm8
 <span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># unlink(filename)</span>
-<span id="L81" class="LineNr"> 81 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L82" class="LineNr"> 82 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xa/imm32/unlink        <span class="Comment"># copy to EAX</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># syscall(unlink, filename)</span>
+<span id="L81" class="LineNr"> 81 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L82" class="LineNr"> 82 </span>  b8/copy-to-EAX  0xa/imm32/unlink
 <span id="L83" class="LineNr"> 83 </span>  cd/syscall  0x80/imm8
 <span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># exit(b)</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># syscall(exit, b)</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># load b</span>
-<span id="L87" class="LineNr"> 87 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              b/imm32                 <span class="Comment"># copy to EBX</span>
-<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L87" class="LineNr"> 87 </span>  bb/copy-to-EBX  b/imm32
+<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Comment">#</span>
-<span id="L90" class="LineNr"> 90 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy to EAX</span>
+<span id="L90" class="LineNr"> 90 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L91" class="LineNr"> 91 </span>  cd/syscall  0x80/imm8
 <span id="L92" class="LineNr"> 92 </span>
 <span id="L93" class="LineNr"> 93 </span>== data
@@ -156,7 +156,7 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>filename:
 <span id="L101" class="LineNr">101 </span>  2e 66 6f 6f 00 00 00 00
 <span id="L102" class="LineNr">102 </span>
-<span id="L103" class="LineNr">103 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L103" class="LineNr">103 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
index abb09b84..f0770c2f 100644
--- a/html/subx/examples/ex8.subx.html
+++ b/html/subx/examples/ex8.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">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
@@ -76,39 +76,41 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L21" class="LineNr">21 </span>  <span class="Comment"># prolog</span>
 <span id="L22" class="LineNr">22 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call ascii_length(argv[1])</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call ascii-length(argv[1])</span>
 <span id="L24" class="LineNr">24 </span>    <span class="Comment"># push args</span>
 <span id="L25" class="LineNr">25 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># call</span>
-<span id="L27" class="LineNr">27 </span>  e8/call  ascii_length/disp32
+<span id="L27" class="LineNr">27 </span>  e8/call  ascii-length/disp32
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># discard args</span>
 <span id="L29" class="LineNr">29 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
 <span id="L30" class="LineNr">30 </span>
 <span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L32" class="LineNr">32 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L33" class="LineNr">33 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
+<span id="L33" class="LineNr">33 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
 <span id="L35" class="LineNr">35 </span>
-<span id="L36" class="LineNr">36 </span>ascii_length:  <span class="Comment"># (s)</span>
+<span id="L36" class="LineNr">36 </span>ascii-length:  <span class="Comment"># (s)</span>
 <span id="L37" class="LineNr">37 </span>  <span class="Comment"># initialize s (EDX)</span>
-<span id="L38" class="LineNr">38 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8                           <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L38" class="LineNr">38 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Comment"># var result = 0 (EAX)</span>
-<span id="L40" class="LineNr">40 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L41" class="LineNr">41 </span>$ascii_length_loop:
+<span id="L40" class="LineNr">40 </span>  b8/copy-to-EAX  0/imm32
+<span id="L41" class="LineNr">41 </span>$ascii-length-loop:
 <span id="L42" class="LineNr">42 </span>  <span class="Comment"># var c = *s (ECX)</span>
 <span id="L43" class="LineNr">43 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDX to lower byte of ECX</span>
 <span id="L44" class="LineNr">44 </span>  <span class="Comment"># if c == '\0' break</span>
 <span id="L45" class="LineNr">45 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare ECX</span>
-<span id="L46" class="LineNr">46 </span>  74/jump-if-equal  $ascii_length_ret/disp8
+<span id="L46" class="LineNr">46 </span>  74/jump-if-equal  $ascii-length-ret/disp8
 <span id="L47" class="LineNr">47 </span>  <span class="Comment"># ++s</span>
 <span id="L48" class="LineNr">48 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># add to EDX</span>
 <span id="L49" class="LineNr">49 </span>  <span class="Comment"># ++result</span>
 <span id="L50" class="LineNr">50 </span>  40/inc-EAX
 <span id="L51" class="LineNr">51 </span>  <span class="Comment"># loop</span>
-<span id="L52" class="LineNr">52 </span>  eb/jump  $ascii_length_loop/disp8
-<span id="L53" class="LineNr">53 </span>$ascii_length_ret:
+<span id="L52" class="LineNr">52 </span>  eb/jump  $ascii-length-loop/disp8
+<span id="L53" class="LineNr">53 </span>$ascii-length-ret:
 <span id="L54" class="LineNr">54 </span>  <span class="Comment"># return (result in EAX)</span>
 <span id="L55" class="LineNr">55 </span>  c3/return
+<span id="L56" class="LineNr">56 </span>
+<span id="L57" class="LineNr">57 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex9.subx.html b/html/subx/examples/ex9.subx.html
index 882f6b51..32f81d1c 100644
--- a/html/subx/examples/ex9.subx.html
+++ b/html/subx/examples/ex9.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">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
 body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
@@ -78,21 +78,21 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>  <span class="Comment"># prolog</span>
 <span id="L24" class="LineNr">24 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L25" class="LineNr">25 </span>  <span class="Comment"># call ascii_difference(argv[1], argv[2])</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Comment"># call ascii-difference(argv[1], argv[2])</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># push argv[2]</span>
 <span id="L27" class="LineNr">27 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># push argv[1]</span>
 <span id="L29" class="LineNr">29 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L30" class="LineNr">30 </span>    <span class="Comment"># call</span>
-<span id="L31" class="LineNr">31 </span>  e8/call  ascii_difference/disp32
+<span id="L31" class="LineNr">31 </span>  e8/call  ascii-difference/disp32
 <span id="L32" class="LineNr">32 </span>    <span class="Comment"># discard args</span>
 <span id="L33" class="LineNr">33 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
 <span id="L34" class="LineNr">34 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L35" class="LineNr">35 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
-<span id="L36" class="LineNr">36 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
+<span id="L36" class="LineNr">36 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L37" class="LineNr">37 </span>  cd/syscall  0x80/imm8
 <span id="L38" class="LineNr">38 </span>
-<span id="L39" class="LineNr">39 </span>ascii_difference:  <span class="Comment"># (s1, s2) : null-terminated ascii strings</span>
+<span id="L39" class="LineNr">39 </span>ascii-difference:  <span class="Comment"># (s1, s2) : null-terminated ascii strings</span>
 <span id="L40" class="LineNr">40 </span>  <span class="Comment"># a = first letter of s1 (ECX)</span>
 <span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EAX</span>
 <span id="L42" class="LineNr">42 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to EAX</span>
@@ -102,6 +102,8 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr">46 </span>  <span class="Comment"># a-b</span>
 <span id="L47" class="LineNr">47 </span>  29/subtract                     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># subtract ECX from EAX</span>
 <span id="L48" class="LineNr">48 </span>  c3/return
+<span id="L49" class="LineNr">49 </span>
+<span id="L50" class="LineNr">50 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>