4052

author: Kartik K. Agaram <vc@akkartik.com> 2017-10-12 23:43:09 -0700
committer: Kartik K. Agaram <vc@akkartik.com> 2017-10-12 23:43:09 -0700
commit: 25ad969f7582d9253f5329812aed5ed5784d8ec8 (patch)
tree: 13ce7948b151b2583d9d372a9ce175ad25a9f836
parent: 9e0ec84fb86e3173a7671ad8d4f7c2ed29613a50 (diff)
download: mu-25ad969f7582d9253f5329812aed5ed5784d8ec8.tar.gz
10 files changed, 1949 insertions, 140 deletions
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
new file mode 100644
index 00000000..db32f79c
--- /dev/null
+++ b/html/subx/000organization.cc.html
@@ -0,0 +1,218 @@
+<!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/000organization.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Delimiter { color: #800080; }
+.Conceal { color: #4e4e4e; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.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">//: You guessed right: the '000' prefix means you should start reading here.</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//:</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//: This project is set up to load all files with a numeric prefix. Just</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//: create a new file and start hacking.</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//:</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: The first few files (00*) are independent of what this program does, an</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: experimental skeleton that will hopefully make it both easier for others to</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//: understand and more malleable, easier to rewrite and remould into radically</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: different shapes without breaking in subtle corner cases. The premise is</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">//: that understandability and rewrite-friendliness are related in a virtuous</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">//: cycle. Doing one well makes it easier to do the other.</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">//:</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment">//: Lower down, this file contains a legal, bare-bones C++ program. It doesn't</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: do anything yet; subsequent files will contain :(...) directives to insert</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: lines into it. For example:</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//:   :(after &quot;more events&quot;)</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: This directive means: insert the following lines after a line in the</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: program containing the words &quot;more events&quot;.</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//:</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: A simple tool is included to 'tangle' all the files together in sequence</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: according to their directives into a single source file containing all the</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment">//: code for the project, and then feed the source file to the compiler.</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">//: (It'll drop these comments starting with a '//:' prefix that only make</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment">//: sense before tangling.)</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Comment">//:</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">//: Directives free up the programmer to order code for others to read rather</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment">//: than as forced by the computer or compiler. Each individual feature can be</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment">//: organized in a self-contained 'layer' that adds code to many different data</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment">//: structures and functions all over the program. The right decomposition into</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Comment">//: layers will let each layer make sense in isolation.</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment">//:</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment">//:   &quot;If I look at any small part of it, I can see what is going on -- I don't</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//:   need to refer to other parts to understand what something is doing.</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">//:</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//:   If I look at any large part in overview, I can see what is going on -- I</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//:   don't need to know all the details to get it.</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//:</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Comment">//:   Every level of detail is as locally coherent and as well thought-out as</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//:   any other level.&quot;</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">//:</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//:       -- Richard Gabriel, &quot;The Quality Without A Name&quot;</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">//:          (<a href="http://dreamsongs.com/Files/PatternsOfSoftware.pdf">http://dreamsongs.com/Files/PatternsOfSoftware.pdf</a>, page 42)</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//:</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Comment">//: Directives are powerful; they permit inserting or modifying any point in</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//: the program. Using them tastefully requires mapping out specific lines as</span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment">//: waypoints for future layers to hook into. Often such waypoints will be in</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: comments, capitalized to hint that other layers rely on their presence.</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//:</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">//: A single waypoint might have many different code fragments hooking into</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">//: it from all over the codebase. Use 'before' directives to insert</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment">//: code at a location in order, top to bottom, and 'after' directives to</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: insert code in reverse order. By convention waypoints intended for insertion</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">//: before begin with 'End'. Notice below how the layers line up above the &quot;End</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: Foo&quot; waypoint.</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//:</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//:   File 001          File 002                File 003</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//:   ============      ===================     ===================</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//:   // Foo</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//:   ------------</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//:              &lt;----  :(before &quot;End Foo&quot;)</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//:                     ....</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//:                     ...</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//:   ------------</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//:              &lt;----------------------------  :(before &quot;End Foo&quot;)</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment">//:                                             ....</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">//:                                             ...</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   // End Foo</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   ============</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment">//:</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">//: Here's part of a layer in color: <a href="http://i.imgur.com/0eONnyX.png">http://i.imgur.com/0eONnyX.png</a>. Directives</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment">//: are shaded dark.</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment">//:</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Comment">//: Layers do more than just shuffle code around. In a well-organized codebase</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Comment">//: it should be possible to stop loading after any file/layer, build and run</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">//: the program, and pass all tests for loaded features. (Relevant is</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">//: <a href="http://youtube.com/watch?v=c8N72t7aScY">http://youtube.com/watch?v=c8N72t7aScY</a>, a scene from &quot;2001: A Space</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Comment">//: Odyssey&quot;.) Get into the habit of running the included script called</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Comment">//: 'test_layers' before you commit any changes.</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment">//:</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Comment">//: This 'subsetting guarantee' ensures that this directory contains a</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Comment">//: cleaned-up narrative of the evolution of this codebase. Organizing</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Comment">//: autobiographically allows a newcomers to rapidly orient themselves,</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Comment">//: reading the first few files to understand a simple gestalt of a program's</span>
+<span id="L84" class="LineNr"> 84 </span><span class="Comment">//: core purpose and features, and later gradually working their way through</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment">//: other features as the need arises.</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Comment">//:</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Comment">//: Programmers shouldn't need to understand everything about a program to</span>
+<span id="L88" class="LineNr"> 88 </span><span class="Comment">//: hack on it. But they shouldn't be prevented from a thorough understanding</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">//: of each aspect either. The goal of layers is to reward curiosity.</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Comment">// Includes</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Comment">// End Includes</span>
+<span id="L93" class="LineNr"> 93 </span>
+<span id="L94" class="LineNr"> 94 </span><span class="Comment">// Types</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Comment">// End Types</span>
+<span id="L96" class="LineNr"> 96 </span>
+<span id="L97" class="LineNr"> 97 </span><span class="Comment">// Function prototypes are auto-generated in the 'build' script; define your</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Comment">// functions in any order. Just be sure to declare each function header all on</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Comment">// one line, ending with the '{'. Our auto-generation scripts are too minimal</span>
+<span id="L100" class="LineNr">100 </span><span class="Comment">// and simple-minded to handle anything else.</span>
+<span id="L101" class="LineNr">101 </span><span class="PreProc">#include </span><span class="Constant">&quot;function_list&quot;</span>  <span class="Comment">// by convention, files ending with '_list' are auto-generated</span>
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Comment">// Globals</span>
+<span id="L104" class="LineNr">104 </span><span class="Comment">//</span>
+<span id="L105" class="LineNr">105 </span><span class="Comment">// All statements in this section should always define a single variable on a</span>
+<span id="L106" class="LineNr">106 </span><span class="Comment">// single line. The 'build' script will simple-mindedly auto-generate extern</span>
+<span id="L107" class="LineNr">107 </span><span class="Comment">// declarations for them. Remember to define (not just declare) constants with</span>
+<span id="L108" class="LineNr">108 </span><span class="Comment">// extern linkage in this section, since C++ global constants have internal</span>
+<span id="L109" class="LineNr">109 </span><span class="Comment">// linkage by default.</span>
+<span id="L110" class="LineNr">110 </span><span class="Comment">//</span>
+<span id="L111" class="LineNr">111 </span><span class="Comment">// End Globals</span>
+<span id="L112" class="LineNr">112 </span>
+<span id="L113" class="LineNr">113 </span><span class="Normal">int</span> main<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="L114" class="LineNr">114 </span>  atexit<span class="Delimiter">(</span>reset<span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Comment">// run on a 32-bit system</span>
+<span id="L116" class="LineNr">116 </span>  assert<span class="Delimiter">(</span><span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int</span><span class="Delimiter">)</span> == <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  assert<span class="Delimiter">(</span><span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">float</span><span class="Delimiter">)</span> == <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  assert_little_endian<span class="Delimiter">();</span>
+<span id="L119" class="LineNr">119 </span>
+<span id="L120" class="LineNr">120 </span>  <span class="Comment">// End One-time Setup</span>
+<span id="L121" class="LineNr">121 </span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment">// Commandline Parsing</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Comment">// End Commandline Parsing</span>
+<span id="L124" class="LineNr">124 </span>
+<span id="L125" class="LineNr">125 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// End Main</span>
+<span id="L126" class="LineNr">126 </span><span class="Delimiter">}</span>
+<span id="L127" class="LineNr">127 </span>
+<span id="L128" class="LineNr">128 </span><span class="Comment">// Unit Tests</span>
+<span id="L129" class="LineNr">129 </span><span class="Comment">// End Unit Tests</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Comment">//: our first directive; insert the following header at the start of the program</span>
+<span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L133" class="LineNr">133 </span><span class="PreProc">#include </span><span class="Constant">&lt;assert.h&gt;</span>
+<span id="L134" class="LineNr">134 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdlib.h&gt;</span>
+<span id="L135" class="LineNr">135 </span>
+<span id="L136" class="LineNr">136 </span><span class="Comment">//: Without directives or with the :(code) directive, lines get added at the</span>
+<span id="L137" class="LineNr">137 </span><span class="Comment">//: end.</span>
+<span id="L138" class="LineNr">138 </span><span class="Delimiter">:(code)</span>
+<span id="L139" class="LineNr">139 </span><span class="Normal">void</span> reset<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Comment">// End Reset</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> assert_little_endian<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">const</span> <span class="Normal">int</span> x = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Normal">const</span> <span class="Normal">char</span>* y = <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 id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>*y != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;the SubX VM only runs on little-endian processors. Do you have Intel (or AMD or Atom) inside?</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Delimiter">}</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
+<span id="L151" class="LineNr">151 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L152" class="LineNr">152 </span><span class="PreProc">#include</span><span class="Constant">&lt;iostream&gt;</span>
+<span id="L153" class="LineNr">153 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
new file mode 100644
index 00000000..73ad6bfb
--- /dev/null
+++ b/html/subx/001help.cc.html
@@ -0,0 +1,275 @@
+<!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/001help.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Conceal { color: #4e4e4e; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
+.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">//: Everything this project/binary supports.</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: This should give you a sense for what to look forward to in later layers.</span>
+<span id="L3" class="LineNr">  3 </span>
+<span id="L4" class="LineNr">  4 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
+<span id="L5" class="LineNr">  5 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &lt;= <span class="Constant">1</span> || is_equal<span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;--help&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L6" class="LineNr">  6 </span>  <span class="Comment">//: this is the functionality later layers will provide</span>
+<span id="L7" class="LineNr">  7 </span>  <span class="Comment">// currently no automated tests for commandline arg parsing</span>
+<span id="L8" class="LineNr">  8 </span>  cerr &lt;&lt; <span class="Constant">&quot;Usage:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>&lt;&lt; <span class="Constant">&quot;  subx test</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L10" class="LineNr"> 10 </span>  <span class="Identifier">return</span> <span class="Constant">0</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="SalientComment">//:: Helper function used by the above fragment of code (and later layers too,</span>
+<span id="L14" class="LineNr"> 14 </span><span class="SalientComment">//:: who knows?).</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//: The :(code) directive appends function definitions to the end of the</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: project. Regardless of where functions are defined, we can call them</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: anywhere we like as long as we format the function header in a specific</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: way: put it all on a single line without indent, end the line with ') {'</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: and no trailing whitespace. As long as functions uniformly start this</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: way, our 'build' script contains a little command to automatically</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//: generate declarations for them.</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(code)</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Normal">bool</span> is_equal<span class="Delimiter">(</span><span class="Normal">char</span>* s<span class="Delimiter">,</span> <span class="Normal">const</span> <span class="Normal">char</span>* lit<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Identifier">return</span> strncmp<span class="Delimiter">(</span>s<span class="Delimiter">,</span> lit<span class="Delimiter">,</span> strlen<span class="Delimiter">(</span>lit<span class="Delimiter">))</span> == <span class="Constant">0</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="Normal">bool</span> starts_with<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="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  a!=s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> &amp;&amp; b!=pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>  ++a<span class="Delimiter">,</span> ++b<span class="Delimiter">)</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Conceal">¦</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="L31" class="LineNr"> 31 </span>  <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
+<span id="L33" class="LineNr"> 33 </span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">//: I'll throw some style conventions here for want of a better place for them.</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: As a rule I hate style guides. Do what you want, that's my motto. But since</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: we're dealing with C/C++, the one big thing we want to avoid is undefined</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: behavior. If a compiler ever encounters undefined behavior it can make</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Comment">//: your program do anything it wants.</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//:</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: For reference, my checklist of undefined behaviors to watch out for:</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//:   out-of-bounds access</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">//:   uninitialized variables</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//:   use after free</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Comment">//:   dereferencing invalid pointers: null, a new of size 0, others</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//:</span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment">//:   casting a large number to a type too small to hold it</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//:</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//:   integer overflow</span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">//:   division by zero and other undefined expressions</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">//:   left-shift by negative count</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment">//:   shifting values by more than or equal to the number of bits they contain</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">//:   bitwise operations on signed numbers</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">//:</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//:   Converting pointers to types of different alignment requirements</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//:     T* -&gt; void* -&gt; T*: defined</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//:     T* -&gt; U* -&gt; T*: defined if non-function pointers and alignment requirements are same</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//:     function pointers may be cast to other function pointers</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//:</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//:       Casting a numeric value into a value that can't be represented by the target type (either directly or via static_cast)</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//:</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//: To guard against these, some conventions:</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//:</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: 0. Initialize all primitive variables in functions and constructors.</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//:</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment">//: 1. Minimize use of pointers and pointer arithmetic. Avoid 'new' and</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">//: 'delete' as far as possible. Rely on STL to perform memory management to</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">//: avoid use-after-free issues (and memory leaks).</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment">//: 2. Avoid naked arrays to avoid out-of-bounds access. Never use operator[]</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">//: except with map. Use at() with STL vectors and so on.</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment">//:</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment">//: 3. Valgrind all the things.</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Comment">//:</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Comment">//: 4. Avoid unsigned numbers. Not strictly an undefined-behavior issue, but</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">//: the extra range doesn't matter, and it's one less confusing category of</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">//: interaction gotchas to worry about.</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Comment">//:</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Comment">//: Corollary: don't use the size() method on containers, since it returns an</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment">//: unsigned and that'll cause warnings about mixing signed and unsigned,</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Comment">//: yadda-yadda. Instead use this macro below to perform an unsafe cast to</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Comment">//: signed. We'll just give up immediately if a container's ever too large.</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Comment">//: Basically, Mu is not concerned about this being a little slower than it</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Comment">//: could be. (<a href="https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7)">https://gist.github.com/rygorous/e0f055bfb74e3d5f0af20690759de5a7)</a></span>
+<span id="L84" class="LineNr"> 84 </span><span class="Comment">//:</span>
+<span id="L85" class="LineNr"> 85 </span><span class="Comment">//: Addendum to corollary: We're going to uniformly use int everywhere, to</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Comment">//: indicate that we're oblivious to number size, and since Clang on 32-bit</span>
+<span id="L87" class="LineNr"> 87 </span><span class="Comment">//: platforms doesn't yet support multiplication over 64-bit integers, and</span>
+<span id="L88" class="LineNr"> 88 </span><span class="Comment">//: since multiplying two integers seems like a more common situation to end</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">//: up in than integer overflow.</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L91" class="LineNr"> 91 </span><span class="PreProc">#define SIZE(X) (assert((X)</span><span class="Delimiter">.</span><span class="PreProc">size() &lt; (</span><span class="Constant">1LL</span><span class="PreProc">&lt;&lt;(</span><span class="Normal">sizeof</span><span class="PreProc">(</span><span class="Normal">int</span><span class="PreProc">)*</span><span class="Constant">8</span><span class="PreProc">-</span><span class="Constant">2</span><span class="PreProc">)))</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;((X)</span><span class="Delimiter">.</span><span class="PreProc">size()))</span>
+<span id="L92" class="LineNr"> 92 </span>
+<span id="L93" class="LineNr"> 93 </span><span class="Comment">//: 5. Integer overflow is guarded against at runtime using the -ftrapv flag</span>
+<span id="L94" class="LineNr"> 94 </span><span class="Comment">//: to the compiler, supported by Clang (GCC version only works sometimes:</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Comment">//: <a href="http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work).">http://stackoverflow.com/questions/20851061/how-to-make-gcc-ftrapv-work).</a></span>
+<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
+<span id="L97" class="LineNr"> 97 </span>initialize_signal_handlers<span class="Delimiter">();</span>  <span class="Comment">// not always necessary, but doesn't hurt</span>
+<span id="L98" class="LineNr"> 98 </span><span class="CommentedCode">//? cerr &lt;&lt; INT_MAX+1 &lt;&lt; '\n';  // test overflow</span>
+<span id="L99" class="LineNr"> 99 </span><span class="CommentedCode">//? assert(false);  // test SIGABRT</span>
+<span id="L100" class="LineNr">100 </span><span class="Delimiter">:(code)</span>
+<span id="L101" class="LineNr">101 </span><span class="Comment">// based on <a href="https://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c">https://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c</a></span>
+<span id="L102" class="LineNr">102 </span><span class="Normal">void</span> initialize_signal_handlers<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">struct</span> sigaction action<span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  bzero<span class="Delimiter">(</span>&amp;action<span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span>action<span class="Delimiter">));</span>
+<span id="L105" class="LineNr">105 </span>  action<span class="Delimiter">.</span>sa_sigaction = dump_and_exit<span class="Delimiter">;</span>
+<span id="L106" class="LineNr">106 </span>  sigemptyset<span class="Delimiter">(</span>&amp;action<span class="Delimiter">.</span>sa_mask<span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGABRT</span><span class="Delimiter">,</span> &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// assert() failure or integer overflow on linux (with -ftrapv)</span>
+<span id="L108" class="LineNr">108 </span>  sigaction<span class="Delimiter">(</span><span class="Constant">SIGILL</span><span class="Delimiter">,</span>  &amp;action<span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">);</span>  <span class="Comment">// integer overflow on OS X (with -ftrapv)</span>
+<span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span>
+<span id="L110" class="LineNr">110 </span><span class="Normal">void</span> dump_and_exit<span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> unused siginfo_t* dummy1<span class="Delimiter">,</span> unused <span class="Normal">void</span>* dummy2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
+<span id="L113" class="LineNr">113 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #ifndef __APPLE__</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #endif</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
+<span id="L119" class="LineNr">119 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #ifdef __APPLE__</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L122" class="LineNr">122 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> #endif</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="Delimiter">}</span>
+<span id="L128" class="LineNr">128 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L129" class="LineNr">129 </span><span class="PreProc">#include </span><span class="Constant">&lt;signal.h&gt;</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Comment">//: For good measure we'll also enable SIGFPE.</span>
+<span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before &quot;atexit(reset)&quot;)</span>
+<span id="L133" class="LineNr">133 </span>feenableexcept<span class="Delimiter">(</span>FE_OVERFLOW | FE_UNDERFLOW<span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span><span class="CommentedCode">//? assert(sizeof(int) == 4 &amp;&amp; sizeof(float) == 4);</span>
+<span id="L135" class="LineNr">135 </span><span class="CommentedCode">//? //                          | exp   |  mantissa</span>
+<span id="L136" class="LineNr">136 </span><span class="CommentedCode">//? int smallest_subnormal = 0b00000000000000000000000000000001;</span>
+<span id="L137" class="LineNr">137 </span><span class="CommentedCode">//? float smallest_subnormal_f = *reinterpret_cast&lt;float*&gt;(&amp;smallest_subnormal);</span>
+<span id="L138" class="LineNr">138 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε: &quot; &lt;&lt; smallest_subnormal_f &lt;&lt; '\n';</span>
+<span id="L139" class="LineNr">139 </span><span class="CommentedCode">//? cerr &lt;&lt; &quot;ε/2: &quot; &lt;&lt; smallest_subnormal_f/2 &lt;&lt; &quot; (underflow)\n&quot;;  // test SIGFPE</span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L141" class="LineNr">141 </span><span class="PreProc">#include </span><span class="Constant">&lt;fenv.h&gt;</span>
+<span id="L142" class="LineNr">142 </span><span class="Delimiter">:(code)</span>
+<span id="L143" class="LineNr">143 </span><span class="PreProc">#ifdef __APPLE__</span>
+<span id="L144" class="LineNr">144 </span><span class="Comment">// Public domain polyfill for feenableexcept on OS X</span>
+<span id="L145" class="LineNr">145 </span><span class="Comment">// <a href="http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c">http://www-personal.umich.edu/~williams/archive/computation/fe-handling-example.c</a></span>
+<span id="L146" class="LineNr">146 </span><span class="Normal">int</span> feenableexcept <span class="Delimiter">(</span><span class="Normal">unsigned</span> <span class="Normal">int</span> excepts<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">static</span> fenv_t fenv<span class="Delimiter">;</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Normal">unsigned</span> <span class="Normal">int</span> new_excepts = excepts &amp; FE_ALL_EXCEPT<span class="Delimiter">;</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">unsigned</span> <span class="Normal">int</span> old_excepts<span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fegetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">))</span> <span class="Identifier">return</span> -<span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L151" class="LineNr">151 </span>  old_excepts = fenv<span class="Delimiter">.</span>__control &amp; FE_ALL_EXCEPT<span class="Delimiter">;</span>
+<span id="L152" class="LineNr">152 </span>  fenv<span class="Delimiter">.</span>__control &amp;= ~new_excepts<span class="Delimiter">;</span>
+<span id="L153" class="LineNr">153 </span>  fenv<span class="Delimiter">.</span>__mxcsr   &amp;= ~<span class="Delimiter">(</span>new_excepts &lt;&lt; <span class="Constant">7</span><span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Identifier">return</span> fesetenv<span class="Delimiter">(</span>&amp;fenv<span class="Delimiter">)</span> ? -<span class="Constant">1</span> : old_excepts<span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span>
+<span id="L156" class="LineNr">156 </span><span class="PreProc">#endif</span>
+<span id="L157" class="LineNr">157 </span>
+<span id="L158" class="LineNr">158 </span><span class="Comment">//: 6. Map's operator[] being non-const is fucking evil.</span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>  <span class="Comment">// can't generate prototypes for these</span>
+<span id="L160" class="LineNr">160 </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="L161" class="LineNr">161 </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="L162" class="LineNr">162 </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="L163" class="LineNr">163 </span>  assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<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">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="L167" class="LineNr">167 </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="L168" class="LineNr">168 </span>  assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Identifier">return</span> iter<span class="Delimiter">-&gt;</span>second<span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">}</span>
+<span id="L171" class="LineNr">171 </span><span class="Normal">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>&amp; put<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="L172" class="LineNr">172 </span>  map[key] = value<span class="Delimiter">;</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Identifier">return</span> map[key]<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">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">bool</span> contains_key<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="L176" class="LineNr">176 </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>end<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">template</span>&lt;<span class="Normal">typename</span> T&gt; <span class="Normal">typename</span> T::mapped_type&amp; get_or_insert<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="L179" class="LineNr">179 </span>  <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span>
+<span id="L180" class="LineNr">180 </span><span class="Delimiter">}</span>
+<span id="L181" class="LineNr">181 </span><span class="Comment">//: The contract: any container that relies on get_or_insert should never call</span>
+<span id="L182" class="LineNr">182 </span><span class="Comment">//: contains_key.</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Comment">//: 7. istreams are a royal pain in the arse. You have to be careful about</span>
+<span id="L185" class="LineNr">185 </span><span class="Comment">//: what subclass you try to putback into. You have to watch out for the pesky</span>
+<span id="L186" class="LineNr">186 </span><span class="Comment">//: failbit and badbit. Just avoid eof() and use this helper instead.</span>
+<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(code)</span>
+<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> has_data<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Identifier">return</span> in &amp;&amp; !in<span class="Delimiter">.</span>eof<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="PreProc">#include </span><span class="Constant">&lt;assert.h&gt;</span>
+<span id="L194" class="LineNr">194 </span>
+<span id="L195" class="LineNr">195 </span><span class="PreProc">#include </span><span class="Constant">&lt;iostream&gt;</span>
+<span id="L196" class="LineNr">196 </span><span class="Normal">using</span> std::istream<span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </span><span class="Normal">using</span> std::ostream<span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span><span class="Normal">using</span> std::iostream<span class="Delimiter">;</span>
+<span id="L199" class="LineNr">199 </span><span class="Normal">using</span> std::cin<span class="Delimiter">;</span>
+<span id="L200" class="LineNr">200 </span><span class="Normal">using</span> std::cout<span class="Delimiter">;</span>
+<span id="L201" class="LineNr">201 </span><span class="Normal">using</span> std::cerr<span class="Delimiter">;</span>
+<span id="L202" class="LineNr">202 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span><span class="PreProc">#include </span><span class="Constant">&lt;string.h&gt;</span>
+<span id="L205" class="LineNr">205 </span><span class="PreProc">#include </span><span class="Constant">&lt;string&gt;</span>
+<span id="L206" class="LineNr">206 </span><span class="Normal">using</span> std::string<span class="Delimiter">;</span>
+<span id="L207" class="LineNr">207 </span>
+<span id="L208" class="LineNr">208 </span><span class="PreProc">#define unused  __attribute__((unused))</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
new file mode 100644
index 00000000..a2a785f4
--- /dev/null
+++ b/html/subx/002test.cc.html
@@ -0,0 +1,177 @@
+<!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/002test.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Conceal { color: #4e4e4e; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
+.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">//: A simple test harness. To create new tests, define functions starting with</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: 'test_'. To run all tests so defined, run:</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//:   $ ./mu test</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//:</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: Every layer should include tests, and can reach into previous layers.</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: However, it seems like a good idea never to reach into tests from previous</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: layers. Every test should be a contract that always passes as originally</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//: written, regardless of any later layers. Avoid writing 'temporary' tests</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: that are only meant to work until some layer.</span>
+<span id="L10" class="LineNr"> 10 </span>
+<span id="L11" class="LineNr"> 11 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Normal">typedef</span> <span class="Normal">void</span> <span class="Delimiter">(</span>*test_fn<span class="Delimiter">)(</span><span class="Normal">void</span><span class="Delimiter">);</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">// move a global ahead into types that we can't generate an extern declaration for</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Normal">const</span> test_fn Tests[] = <span class="Delimiter">{</span>
+<span id="L16" class="LineNr"> 16 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build' script</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Delimiter">};</span>
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Normal">bool</span> Run_tests = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Normal">bool</span> Passed = <span class="Constant">true</span><span class="Delimiter">;</span>  <span class="Comment">// set this to false inside any test to indicate failure</span>
+<span id="L22" class="LineNr"> 22 </span>
+<span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L24" class="LineNr"> 24 </span><span class="PreProc">#define CHECK(X) \</span>
+<span id="L25" class="LineNr"> 25 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; !(X)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L26" class="LineNr"> 26 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #X &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L27" class="LineNr"> 27 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L28" class="LineNr"> 28 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L29" class="LineNr"> 29 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L30" class="LineNr"> 30 </span>
+<span id="L31" class="LineNr"> 31 </span><span class="PreProc">#define CHECK_EQ(X</span><span class="Delimiter">,</span><span class="PreProc"> Y) \</span>
+<span id="L32" class="LineNr"> 32 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; (X) != (Y)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L33" class="LineNr"> 33 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): &quot;</span><span class="PreProc"> &lt;&lt; #X &lt;&lt; </span><span class="Constant">&quot; == &quot;</span><span class="PreProc"> &lt;&lt; #Y &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L34" class="LineNr"> 34 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; (X) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> BEWARE: multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L35" class="LineNr"> 35 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L36" class="LineNr"> 36 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L37" class="LineNr"> 37 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L38" class="LineNr"> 38 </span>
+<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L40" class="LineNr"> 40 </span>Passed = <span class="Constant">true</span><span class="Delimiter">;</span>
+<span id="L41" class="LineNr"> 41 </span>
+<span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before &quot;End Commandline Parsing&quot;)</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc &gt; <span class="Constant">1</span> &amp;&amp; is_equal<span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">&quot;test&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L44" class="LineNr"> 44 </span>  Run_tests = <span class="Constant">true</span><span class="Delimiter">;</span>  --argc<span class="Delimiter">;</span>  ++argv<span class="Delimiter">;</span>  <span class="Comment">// shift 'test' out of commandline args</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Delimiter">}</span>
+<span id="L46" class="LineNr"> 46 </span>
+<span id="L47" class="LineNr"> 47 </span><span class="Delimiter">:(before &quot;End Main&quot;)</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Run_tests<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Comment">// Test Runs</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="Comment">// we run some tests and then exit; assume no state need be maintained afterward</span>
+<span id="L51" class="LineNr"> 51 </span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">long</span> num_failures = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Comment">// End Test Run Initialization</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">time_t</span> t<span class="Delimiter">;</span>  time<span class="Delimiter">(</span>&amp;t<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  cerr &lt;&lt; <span class="Constant">&quot;C tests: &quot;</span> &lt;&lt; ctime<span class="Delimiter">(</span>&amp;t<span class="Delimiter">);</span>
+<span id="L56" class="LineNr"> 56 </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="Normal">sizeof</span><span class="Delimiter">(</span>Tests<span class="Delimiter">)</span>/<span class="Normal">sizeof</span><span class="Delimiter">(</span>Tests[<span class="Constant">0</span>]<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L57" class="LineNr"> 57 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;running .build/test_list line &quot; &lt;&lt; (i+1) &lt;&lt; '\n';</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="Conceal">¦</span> run_test<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>Passed<span class="Delimiter">)</span> cerr &lt;&lt; <span class="Constant">'.'</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> ++num_failures<span class="Delimiter">;</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="Delimiter">}</span>
+<span id="L62" class="LineNr"> 62 </span>  cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// End Tests</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>num_failures &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; num_failures &lt;&lt; <span class="Constant">&quot; failure&quot;</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>&lt;&lt; <span class="Delimiter">(</span>num_failures &gt; <span class="Constant">1</span> ? <span class="Constant">&quot;s&quot;</span> : <span class="Constant">&quot;&quot;</span><span class="Delimiter">)</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span>&lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="Delimiter">}</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Identifier">return</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 id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(code)</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> run_test<span class="Delimiter">(</span><span class="Normal">size_t</span> i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt;= <span class="Normal">sizeof</span><span class="Delimiter">(</span>Tests<span class="Delimiter">)</span>/<span class="Normal">sizeof</span><span class="Delimiter">(</span>Tests[<span class="Constant">0</span>]<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;no test &quot;</span> &lt;&lt; i &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Conceal">¦</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>  reset<span class="Delimiter">();</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment">// End Test Setup</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">(</span>*Tests[i]<span class="Delimiter">)();</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">// End Test Teardown</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">}</span>
+<span id="L84" class="LineNr"> 84 </span>
+<span id="L85" class="LineNr"> 85 </span><span class="Normal">bool</span> is_integer<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L86" class="LineNr"> 86 </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="L87" class="LineNr"> 87 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L88" class="LineNr"> 88 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="Delimiter">;</span>  <span class="Comment">// '-' only at first position</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Normal">int</span> to_integer<span class="Delimiter">(</span>string n<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">char</span>* end = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Comment">// safe because string.c_str() is guaranteed to be null-terminated</span>
+<span id="L94" class="LineNr"> 94 </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="L95" class="LineNr"> 95 </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>
+<span id="L96" class="LineNr"> 96 </span>  assert<span class="Delimiter">(</span>*end == <span class="cSpecial">'\0'</span><span class="Delimiter">);</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">}</span>
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">void</span> test_is_integer<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L101" class="LineNr">101 </span>  CHECK<span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span><span class="Constant">&quot;1234&quot;</span><span class="Delimiter">));</span>
+<span id="L102" class="LineNr">102 </span>  CHECK<span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span><span class="Constant">&quot;-1&quot;</span><span class="Delimiter">));</span>
+<span id="L103" class="LineNr">103 </span>  CHECK<span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">&quot;234.0&quot;</span><span class="Delimiter">));</span>
+<span id="L104" class="LineNr">104 </span>  CHECK<span class="Delimiter">(</span>is_integer<span class="Delimiter">(</span><span class="Constant">&quot;-567&quot;</span><span class="Delimiter">));</span>
+<span id="L105" class="LineNr">105 </span>  CHECK<span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">&quot;89-0&quot;</span><span class="Delimiter">));</span>
+<span id="L106" class="LineNr">106 </span>  CHECK<span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">&quot;-&quot;</span><span class="Delimiter">));</span>
+<span id="L107" class="LineNr">107 </span>  CHECK<span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">&quot;1e3&quot;</span><span class="Delimiter">));</span>  <span class="Comment">// not supported</span>
+<span id="L108" class="LineNr">108 </span><span class="Delimiter">}</span>
+<span id="L109" class="LineNr">109 </span>
+<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L111" class="LineNr">111 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdlib.h&gt;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
new file mode 100644
index 00000000..9fca7be6
--- /dev/null
+++ b/html/subx/003trace.cc.html
@@ -0,0 +1,463 @@
+<!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/003trace.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Conceal { color: #4e4e4e; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.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">//: The goal of layers is to make programs more easy to understand and more</span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment">//: malleable, easy to rewrite in radical ways without accidentally breaking</span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">//: some corner case. Tests further both goals. They help understandability by</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment">//: letting one make small changes and get feedback. What if I wrote this line</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">//: like so? What if I removed this function call, is it really necessary?</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">//: Just try it, see if the tests pass. Want to explore rewriting this bit in</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment">//: this way? Tests put many refactorings on a firmer footing.</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">//:</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">//: But the usual way we write tests seems incomplete. Refactorings tend to</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">//: work in the small, but don't help with changes to function boundaries. If</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">//: you want to extract a new function you have to manually test-drive it to</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">//: create tests for it. If you want to inline a function its tests are no</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment">//: longer valid. In both cases you end up having to reorganize code as well as</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">//: tests, an error-prone activity.</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">//:</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">//: In response, this layer introduces the notion of *domain-driven* testing.</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">//: We focus on the domain of inputs the whole program needs to handle rather</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">//: than the correctness of individual functions. All tests invoke the program</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">//: in a single way: by calling run() with some input. As the program operates</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment">//: on the input, it traces out a list of _facts_ deduced about the domain:</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">//:   trace(&quot;label&quot;) &lt;&lt; &quot;fact 1: &quot; &lt;&lt; val;</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment">//:</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment">//: Tests can now check these facts:</span>
+<span id="L24" class="LineNr"> 24 </span><span class="Comment">//:   :(scenario foo)</span>
+<span id="L25" class="LineNr"> 25 </span><span class="Comment">//:   34  # call run() with this input</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment">//:   +label: fact 1: 34  # 'run' should have deduced this fact</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment">//:   -label: fact 1: 35  # the trace should not contain such a fact</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Comment">//:</span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment">//: Since we never call anything but the run() function directly, we never have</span>
+<span id="L30" class="LineNr"> 30 </span><span class="Comment">//: to rewrite the tests when we reorganize the internals of the program. We</span>
+<span id="L31" class="LineNr"> 31 </span><span class="Comment">//: just have to make sure our rewrite deduces the same facts about the domain,</span>
+<span id="L32" class="LineNr"> 32 </span><span class="Comment">//: and that's something we're going to have to do anyway.</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Comment">//:</span>
+<span id="L34" class="LineNr"> 34 </span><span class="Comment">//: To avoid the combinatorial explosion of integration tests, each layer</span>
+<span id="L35" class="LineNr"> 35 </span><span class="Comment">//: mainly logs facts to the trace with a common *label*. All tests in a layer</span>
+<span id="L36" class="LineNr"> 36 </span><span class="Comment">//: tend to check facts with this label. Validating the facts logged with a</span>
+<span id="L37" class="LineNr"> 37 </span><span class="Comment">//: specific label is like calling functions of that layer directly.</span>
+<span id="L38" class="LineNr"> 38 </span><span class="Comment">//:</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//: To build robust tests, trace facts about your domain rather than details of</span>
+<span id="L40" class="LineNr"> 40 </span><span class="Comment">//: how you computed them.</span>
+<span id="L41" class="LineNr"> 41 </span><span class="Comment">//:</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Comment">//: More details: <a href="http://akkartik.name/blog/tracing-tests">http://akkartik.name/blog/tracing-tests</a></span>
+<span id="L43" class="LineNr"> 43 </span><span class="Comment">//:</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Comment">//: ---</span>
+<span id="L45" class="LineNr"> 45 </span><span class="Comment">//:</span>
+<span id="L46" class="LineNr"> 46 </span><span class="Comment">//: Between layers and domain-driven testing, programming starts to look like a</span>
+<span id="L47" class="LineNr"> 47 </span><span class="Comment">//: fundamentally different activity. Instead of a) superficial, b) local rules</span>
+<span id="L48" class="LineNr"> 48 </span><span class="Comment">//: on c) code [like say <a href="http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],">http://blog.bbv.ch/2013/06/05/clean-code-cheat-sheet],</a></span>
+<span id="L49" class="LineNr"> 49 </span><span class="Comment">//: we allow programmers to engage with the a) deep, b) global structure of the</span>
+<span id="L50" class="LineNr"> 50 </span><span class="Comment">//: c) domain. If you can systematically track discontinuities in the domain,</span>
+<span id="L51" class="LineNr"> 51 </span><span class="Comment">//: you don't care if the code used gotos as long as it passed the tests. If</span>
+<span id="L52" class="LineNr"> 52 </span><span class="Comment">//: tests become more robust to run it becomes easier to try out radically</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Comment">//: different implementations for the same program. If code is super-easy to</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: rewrite, it becomes less important what indentation style it uses, or that</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: the objects are appropriately encapsulated, or that the functions are</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//: referentially transparent.</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//:</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: Instead of plumbing, programming becomes building and gradually refining a</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: map of the environment the program must operate under. Whether a program is</span>
+<span id="L60" class="LineNr"> 60 </span><span class="Comment">//: 'correct' at a given point in time is a red herring; what matters is</span>
+<span id="L61" class="LineNr"> 61 </span><span class="Comment">//: avoiding regression by monotonically nailing down the more 'eventful' parts</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Comment">//: of the terrain. It helps readers new and old, and rewards curiosity, to</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Comment">//: organize large programs in self-similar hierarchies of example scenarios</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Comment">//: colocated with the code that makes them work.</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment">//:</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">//:   &quot;Programming properly should be regarded as an activity by which</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">//:   programmers form a mental model, rather than as production of a program.&quot;</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">//:   -- Peter Naur (<a href="http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)">http://alistair.cockburn.us/ASD+book+extract%3A+%22Naur,+Ehn,+Musashi%22)</a></span>
+<span id="L69" class="LineNr"> 69 </span>
+<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Normal">struct</span> trace_line <span class="Delimiter">{</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">int</span> depth<span class="Delimiter">;</span>  <span class="Comment">// optional field just to help browse traces later</span>
+<span id="L73" class="LineNr"> 73 </span>  string label<span class="Delimiter">;</span>
+<span id="L74" class="LineNr"> 74 </span>  string contents<span class="Delimiter">;</span>
+<span id="L75" class="LineNr"> 75 </span>  trace_line<span class="Delimiter">(</span>string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :depth<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> contents<span class="Delimiter">(</span>c<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L76" class="LineNr"> 76 </span>  trace_line<span class="Delimiter">(</span><span class="Normal">int</span> d<span class="Delimiter">,</span> string l<span class="Delimiter">,</span> string c<span class="Delimiter">)</span> :depth<span class="Delimiter">(</span>d<span class="Delimiter">),</span> label<span class="Delimiter">(</span>l<span class="Delimiter">),</span> contents<span class="Delimiter">(</span>c<span class="Delimiter">)</span> <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="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L80" class="LineNr"> 80 </span><span class="Normal">bool</span> Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> Dump_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L82" class="LineNr"> 82 </span>string Dump_label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L84" class="LineNr"> 84 </span>Hide_errors = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L85" class="LineNr"> 85 </span>Dump_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span>Dump_label = <span class="Constant">&quot;&quot;</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 Types&quot;)</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">// Pre-define some global constants that trace_stream needs to know about.</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Comment">// Since they're in the Types section, they'll be included in any cleaved</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Comment">// compilation units. So no extern linkage.</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Normal">const</span> <span class="Normal">int</span> Max_depth = <span class="Constant">9999</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Normal">const</span> <span class="Normal">int</span> Error_depth = <span class="Constant">0</span><span class="Delimiter">;</span>  <span class="Comment">// definitely always print errors</span>
+<span id="L94" class="LineNr"> 94 </span>
+<span id="L95" class="LineNr"> 95 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span>
+<span id="L96" class="LineNr"> 96 </span>  vector&lt;trace_line&gt; past_lines<span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">// accumulator for current line</span>
+<span id="L98" class="LineNr"> 98 </span>  ostringstream* curr_stream<span class="Delimiter">;</span>
+<span id="L99" class="LineNr"> 99 </span>  string curr_label<span class="Delimiter">;</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Normal">int</span> curr_depth<span class="Delimiter">;</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">int</span> callstack_depth<span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">int</span> collect_depth<span class="Delimiter">;</span>
+<span id="L103" class="LineNr">103 </span>  ofstream null_stream<span class="Delimiter">;</span>  <span class="Comment">// never opens a file, so writes silently fail</span>
+<span id="L104" class="LineNr">104 </span>  trace_stream<span class="Delimiter">()</span> :curr_stream<span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> curr_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">),</span> callstack_depth<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> collect_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">)</span> <span class="Delimiter">{}</span>
+<span id="L105" class="LineNr">105 </span>  ~trace_stream<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_stream<span class="Delimiter">)</span> <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span>  ostream&amp; stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> stream<span class="Delimiter">(</span>Max_depth<span class="Delimiter">,</span> label<span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
+<span id="L110" class="LineNr">110 </span>
+<span id="L111" class="LineNr">111 </span>  ostream&amp; stream<span class="Delimiter">(</span><span class="Normal">int</span> depth<span class="Delimiter">,</span> string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>depth &gt; collect_depth<span class="Delimiter">)</span> <span class="Identifier">return</span> null_stream<span class="Delimiter">;</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> curr_label = label<span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> curr_depth = depth<span class="Delimiter">;</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Delimiter">}</span>
+<span id="L118" class="LineNr">118 </span>
+<span id="L119" class="LineNr">119 </span>  <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Normal">void</span> newline<span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Comment">// useful for debugging</span>
+<span id="L122" class="LineNr">122 </span>  string readable_contents<span class="Delimiter">(</span>string label<span class="Delimiter">);</span>  <span class="Comment">// empty label = show everything</span>
+<span id="L123" class="LineNr">123 </span><span class="Delimiter">};</span>
+<span id="L124" class="LineNr">124 </span>
+<span id="L125" class="LineNr">125 </span><span class="Delimiter">:(code)</span>
+<span id="L126" class="LineNr">126 </span><span class="Normal">void</span> trace_stream::newline<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span>  string curr_contents = curr_stream<span class="Delimiter">-&gt;</span>str<span class="Delimiter">();</span>
+<span id="L129" class="LineNr">129 </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="L130" class="LineNr">130 </span>  <span class="Conceal">¦</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> trim<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="L131" class="LineNr">131 </span>  <span class="Conceal">¦</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="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || Dump_trace
+<span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</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>
+<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; curr_label &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="L135" class="LineNr">135 </span>  <span class="Delimiter">}</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span>  curr_label<span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L139" class="LineNr">139 </span>  curr_depth = Max_depth<span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span>
+<span id="L142" class="LineNr">142 </span>string trace_stream::readable_contents<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L143" class="LineNr">143 </span>  ostringstream output<span class="Delimiter">;</span>
+<span id="L144" class="LineNr">144 </span>  label = trim<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L145" class="LineNr">145 </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>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Conceal">¦</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="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L153" class="LineNr">153 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span>
+<span id="L154" class="LineNr">154 </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="L155" class="LineNr">155 </span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L157" class="LineNr">157 </span><span class="PreProc">#define CLEAR_TRACE  </span><span class="Normal">delete</span><span class="PreProc"> Trace_stream</span><span class="Delimiter">,</span><span class="PreProc"> Trace_stream = </span><span class="Normal">new</span><span class="PreProc"> trace_stream</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span><span class="Comment">// Top-level helper. IMPORTANT: can't nest</span>
+<span id="L160" class="LineNr">160 </span><span class="PreProc">#define trace(</span><span class="Delimiter">...</span><span class="PreProc">)  !Trace_stream ? cerr </span><span class="Comment">/*</span><span class="Comment">print nothing</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(__VA_ARGS__)</span>
+<span id="L161" class="LineNr">161 </span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">// Just for debugging; 'git log' should never show any calls to 'dbg'.</span>
+<span id="L163" class="LineNr">163 </span><span class="PreProc">#define dbg trace(</span><span class="Constant">0</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;a&quot;</span><span class="PreProc">)</span>
+<span id="L164" class="LineNr">164 </span><span class="PreProc">#define DUMP(label)  </span><span class="Normal">if</span><span class="PreProc"> (Trace_stream) cerr &lt;&lt; Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">readable_contents(label)</span><span class="Delimiter">;</span>
+<span id="L165" class="LineNr">165 </span>
+<span id="L166" class="LineNr">166 </span><span class="Comment">// Errors are a special layer.</span>
+<span id="L167" class="LineNr">167 </span><span class="PreProc">#define raise  (!Trace_stream ? (++Trace_errors</span><span class="Delimiter">,</span><span class="PreProc">cerr) </span><span class="Comment">/*</span><span class="Comment">do print</span><span class="Comment">*/</span><span class="PreProc"> : Trace_stream</span><span class="Delimiter">-&gt;</span><span class="PreProc">stream(Error_depth</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;error&quot;</span><span class="PreProc">))</span>
+<span id="L168" class="LineNr">168 </span><span class="Comment">// If we aren't yet sure how to deal with some corner case, use assert_for_now</span>
+<span id="L169" class="LineNr">169 </span><span class="Comment">// to indicate that it isn't an inviolable invariant.</span>
+<span id="L170" class="LineNr">170 </span><span class="PreProc">#define assert_for_now assert</span>
+<span id="L171" class="LineNr">171 </span>
+<span id="L172" class="LineNr">172 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span>
+<span id="L173" class="LineNr">173 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span>
+<span id="L174" class="LineNr">174 </span><span class="Delimiter">:(before &quot;End Test Teardown&quot;)</span>
+<span id="L175" class="LineNr">175 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed &amp;&amp; !Hide_errors &amp;&amp; trace_contains_errors<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L176" class="LineNr">176 </span>  Passed = <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="Delimiter">:(code)</span>
+<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> trace_contains_errors<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </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="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="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L184" class="LineNr">184 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(code)</span>
+<span id="L186" class="LineNr">186 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> unused end<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-&gt;</span>newline<span class="Delimiter">();</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
+<span id="L189" class="LineNr">189 </span><span class="Delimiter">}</span>
+<span id="L190" class="LineNr">190 </span>
+<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L192" class="LineNr">192 </span><span class="Normal">bool</span> Save_trace = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span>
+<span id="L195" class="LineNr">195 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L196" class="LineNr">196 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span>
+<span id="L197" class="LineNr">197 </span>  lease_tracer<span class="Delimiter">();</span>
+<span id="L198" class="LineNr">198 </span>  ~lease_tracer<span class="Delimiter">();</span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">};</span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(code)</span>
+<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>lease_tracer::~lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L203" class="LineNr">203 </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 class="Comment">// in case tests close Trace_stream</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Conceal">¦</span> ofstream fout<span class="Delimiter">(</span><span class="Constant">&quot;last_trace&quot;</span><span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Conceal">¦</span> fout &lt;&lt; Trace_stream<span class="Delimiter">-&gt;</span>readable_contents<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <span class="Conceal">¦</span> fout<span class="Delimiter">.</span>close<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">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</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="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L212" class="LineNr">212 </span><span class="PreProc">#define START_TRACING_UNTIL_END_OF_SCOPE  lease_tracer leased_tracer</span><span class="Delimiter">;</span>
+<span id="L213" class="LineNr">213 </span><span class="Delimiter">:(before &quot;End Test Setup&quot;)</span>
+<span id="L214" class="LineNr">214 </span>START_TRACING_UNTIL_END_OF_SCOPE
+<span id="L215" class="LineNr">215 </span>
+<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L217" class="LineNr">217 </span><span class="PreProc">#define CHECK_TRACE_CONTENTS(</span><span class="Delimiter">...</span><span class="PreProc">)  check_trace_contents(__FUNCTION__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__FILE__</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">__LINE__</span><span class="Delimiter">,</span><span class="PreProc"> __VA_ARGS__)</span>
+<span id="L218" class="LineNr">218 </span>
+<span id="L219" class="LineNr">219 </span><span class="PreProc">#define CHECK_TRACE_CONTAINS_ERRORS()  CHECK(trace_contains_errors())</span>
+<span id="L220" class="LineNr">220 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span>
+<span id="L221" class="LineNr">221 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_contains_errors()) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L222" class="LineNr">222 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L223" class="LineNr">223 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> DUMP(</span><span class="Constant">&quot;error&quot;</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L224" class="LineNr">224 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L225" class="LineNr">225 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L226" class="LineNr">226 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L227" class="LineNr">227 </span>
+<span id="L228" class="LineNr">228 </span><span class="PreProc">#define CHECK_TRACE_COUNT(label</span><span class="Delimiter">,</span><span class="PreProc"> count) \</span>
+<span id="L229" class="LineNr">229 </span><span class="PreProc">  </span><span class="Normal">if</span><span class="PreProc"> (Passed &amp;&amp; trace_count(label) != (count)) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L230" class="LineNr">230 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span><span class="PreProc"> &lt;&lt; __FUNCTION__ &lt;&lt; </span><span class="Constant">&quot;(&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__FILE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;:&quot;</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">__LINE__</span><span class="PreProc"> &lt;&lt; </span><span class="Constant">&quot;): trace_count of &quot;</span><span class="PreProc"> &lt;&lt; label &lt;&lt; </span><span class="Constant">&quot; should be &quot;</span><span class="PreProc"> &lt;&lt; count &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L231" class="LineNr">231 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> cerr &lt;&lt; </span><span class="Constant">&quot;  got &quot;</span><span class="PreProc"> &lt;&lt; trace_count(label) &lt;&lt; </span><span class="cSpecial">'\n'</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L232" class="LineNr">232 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> DUMP(label)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L233" class="LineNr">233 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> Passed = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L234" class="LineNr">234 </span><span class="PreProc">  </span><span class="Conceal">¦</span><span class="PreProc"> </span><span class="Identifier">return</span><span class="Delimiter">;</span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L235" class="LineNr">235 </span><span class="PreProc">  </span><span class="Delimiter">}</span>
+<span id="L236" class="LineNr">236 </span>
+<span id="L237" class="LineNr">237 </span><span class="PreProc">#define CHECK_TRACE_DOESNT_CONTAIN(</span><span class="Delimiter">...</span><span class="PreProc">)  CHECK(trace_doesnt_contain(__VA_ARGS__))</span>
+<span id="L238" class="LineNr">238 </span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">:(code)</span>
+<span id="L240" class="LineNr">240 </span><span class="Normal">bool</span> check_trace_contents<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="L241" class="LineNr">241 </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="L242" class="LineNr">242 </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="L243" class="LineNr">243 </span>  vector&lt;string&gt; expected_lines = split<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;^D&quot;</span><span class="Delimiter">);</span>
+<span id="L244" class="LineNr">244 </span>  <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; SIZE<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="L246" class="LineNr">246 </span>  <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == SIZE<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="L248" class="LineNr">248 </span>  string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span>
+<span id="L249" class="LineNr">249 </span>  split_label_contents<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="L250" class="LineNr">250 </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>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L251" class="LineNr">251 </span>  <span class="Conceal">¦</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="L252" class="LineNr">252 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contents != trim<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="L253" class="LineNr">253 </span>  <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line &lt; SIZE<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="L255" class="LineNr">255 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr_expected_line<span class="Delimiter">;</span>
+<span id="L256" class="LineNr">256 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == SIZE<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="L257" class="LineNr">257 </span>  <span class="Conceal">¦</span> split_label_contents<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="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">if</span> <span class="Delimiter">(</span>line_exists_anywhere<span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Conceal">¦</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 trace:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Conceal">¦</span> DUMP<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</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="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Conceal">¦</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 trace:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </span>  <span class="Conceal">¦</span> DUMP<span class="Delimiter">(</span>label<span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Delimiter">}</span>
+<span id="L268" class="LineNr">268 </span>  Passed = <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span>
+<span id="L270" class="LineNr">270 </span><span class="Delimiter">}</span>
+<span id="L271" class="LineNr">271 </span>
+<span id="L272" class="LineNr">272 </span><span class="Normal">void</span> split_label_contents<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="L273" class="LineNr">273 </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="L274" class="LineNr">274 </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="L275" class="LineNr">275 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Conceal">¦</span> *label = <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L277" class="LineNr">277 </span>  <span class="Conceal">¦</span> *contents = trim<span class="Delimiter">(</span>s<span class="Delimiter">);</span>
+<span id="L278" class="LineNr">278 </span>  <span class="Delimiter">}</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Conceal">¦</span> *label = trim<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="L281" class="LineNr">281 </span>  <span class="Conceal">¦</span> *contents = trim<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="L282" class="LineNr">282 </span>  <span class="Delimiter">}</span>
+<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
+<span id="L284" class="LineNr">284 </span>
+<span id="L285" class="LineNr">285 </span><span class="Normal">bool</span> line_exists_anywhere<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="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>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Conceal">¦</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="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>contents == trim<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="L289" class="LineNr">289 </span>  <span class="Delimiter">}</span>
+<span id="L290" class="LineNr">290 </span>  <span class="Identifier">return</span> <span class="Constant">false</span><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">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L294" class="LineNr">294 </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="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> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr">298 </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="L299" class="LineNr">299 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L300" class="LineNr">300 </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>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Conceal">¦</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="L302" class="LineNr">302 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>line == <span class="Constant">&quot;&quot;</span> || trim<span class="Delimiter">(</span>line<span class="Delimiter">)</span> == trim<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">))</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++result<span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Delimiter">}</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span> result<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">int</span> trace_count_prefix<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L310" class="LineNr">310 </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="L311" class="LineNr">311 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L312" class="LineNr">312 </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>end<span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Conceal">¦</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="L314" class="LineNr">314 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>starts_with<span class="Delimiter">(</span>trim<span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>contents<span class="Delimiter">),</span> trim<span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++result<span class="Delimiter">;</span>
+<span id="L316" class="LineNr">316 </span>  <span class="Conceal">¦</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="Identifier">return</span> result<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> 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="L322" class="LineNr">322 </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="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> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L326" class="LineNr">326 </span>  vector&lt;string&gt; tmp = split_first<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
+<span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
+<span id="L329" class="LineNr">329 </span>
+<span id="L330" class="LineNr">330 </span>vector&lt;string&gt; split<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L331" class="LineNr">331 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L332" class="LineNr">332 </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="L333" class="LineNr">333 </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="L334" class="LineNr">334 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>end == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L335" class="LineNr">335 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</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="L336" class="LineNr">336 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L337" class="LineNr">337 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L338" class="LineNr">338 </span>  <span class="Conceal">¦</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="L339" class="LineNr">339 </span>  <span class="Conceal">¦</span> begin = end+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">);</span>
+<span id="L340" class="LineNr">340 </span>  <span class="Conceal">¦</span> end = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">,</span> begin<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>vector&lt;string&gt; split_first<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L346" class="LineNr">346 </span>  vector&lt;string&gt; result<span class="Delimiter">;</span>
+<span id="L347" class="LineNr">347 </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="L348" class="LineNr">348 </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="L349" class="LineNr">349 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>end != string::npos<span class="Delimiter">)</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Conceal">¦</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="L351" class="LineNr">351 </span>  <span class="Identifier">return</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 id="L354" class="LineNr">354 </span>string trim<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>
+<span id="L356" class="LineNr">356 </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="L357" class="LineNr">357 </span>  <span class="Conceal">¦</span> ++first<span class="Delimiter">;</span>
+<span id="L358" class="LineNr">358 </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="L359" class="LineNr">359 </span>
+<span id="L360" class="LineNr">360 </span>  string::const_iterator last = --s<span class="Delimiter">.</span>end<span class="Delimiter">();</span>
+<span id="L361" class="LineNr">361 </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="L362" class="LineNr">362 </span>  <span class="Conceal">¦</span> --last<span class="Delimiter">;</span>
+<span id="L363" class="LineNr">363 </span>  ++last<span class="Delimiter">;</span>
+<span id="L364" class="LineNr">364 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>first<span class="Delimiter">,</span> last<span class="Delimiter">);</span>
+<span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>
+<span id="L367" class="LineNr">367 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L368" class="LineNr">368 </span><span class="PreProc">#include </span><span class="Constant">&lt;vector&gt;</span>
+<span id="L369" class="LineNr">369 </span><span class="Normal">using</span> std::vector<span class="Delimiter">;</span>
+<span id="L370" class="LineNr">370 </span><span class="PreProc">#include </span><span class="Constant">&lt;list&gt;</span>
+<span id="L371" class="LineNr">371 </span><span class="Normal">using</span> std::list<span class="Delimiter">;</span>
+<span id="L372" class="LineNr">372 </span><span class="PreProc">#include </span><span class="Constant">&lt;map&gt;</span>
+<span id="L373" class="LineNr">373 </span><span class="Normal">using</span> std::map<span class="Delimiter">;</span>
+<span id="L374" class="LineNr">374 </span><span class="PreProc">#include </span><span class="Constant">&lt;set&gt;</span>
+<span id="L375" class="LineNr">375 </span><span class="Normal">using</span> std::set<span class="Delimiter">;</span>
+<span id="L376" class="LineNr">376 </span><span class="PreProc">#include </span><span class="Constant">&lt;algorithm&gt;</span>
+<span id="L377" class="LineNr">377 </span>
+<span id="L378" class="LineNr">378 </span><span class="PreProc">#include </span><span class="Constant">&lt;sstream&gt;</span>
+<span id="L379" class="LineNr">379 </span><span class="Normal">using</span> std::istringstream<span class="Delimiter">;</span>
+<span id="L380" class="LineNr">380 </span><span class="Normal">using</span> std::ostringstream<span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span>
+<span id="L382" class="LineNr">382 </span><span class="PreProc">#include </span><span class="Constant">&lt;fstream&gt;</span>
+<span id="L383" class="LineNr">383 </span><span class="Normal">using</span> std::ifstream<span class="Delimiter">;</span>
+<span id="L384" class="LineNr">384 </span><span class="Normal">using</span> std::ofstream<span class="Delimiter">;</span>
+<span id="L385" class="LineNr">385 </span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L387" class="LineNr">387 </span><span class="Comment">//: In future layers we'll use the depth field as follows:</span>
+<span id="L388" class="LineNr">388 </span><span class="Comment">//:</span>
+<span id="L389" class="LineNr">389 </span><span class="Comment">//: Errors will be depth 0.</span>
+<span id="L390" class="LineNr">390 </span><span class="Comment">//: Mu 'applications' will be able to use depths 1-100 as they like.</span>
+<span id="L391" class="LineNr">391 </span><span class="Comment">//: Primitive statements will occupy 101-9989</span>
+<span id="L392" class="LineNr">392 </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="L393" class="LineNr">393 </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="L394" class="LineNr">394 </span><span class="Comment">//: Finally, details of primitive Mu statements will occupy depth 9990-9999</span>
+<span id="L395" class="LineNr">395 </span><span class="Comment">//: (more on that later as well)</span>
+<span id="L396" class="LineNr">396 </span><span class="Comment">//:</span>
+<span id="L397" class="LineNr">397 </span><span class="Comment">//: This framework should help us hide some details at each level, mixing</span>
+<span id="L398" class="LineNr">398 </span><span class="Comment">//: static ideas like layers with the dynamic notion of call-stack depth.</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
new file mode 100644
index 00000000..1ec0e1a7
--- /dev/null
+++ b/html/subx/003trace.test.cc.html
@@ -0,0 +1,186 @@
+<!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/003trace.test.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.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="Normal">void</span> test_trace_check_compares<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L2" class="LineNr">  2 </span>  trace<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>  CHECK_TRACE_CONTENTS<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> test_trace_check_ignores_other_layers<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L7" class="LineNr">  7 </span>  trace<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>  trace<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>  CHECK_TRACE_CONTENTS<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>  CHECK_TRACE_DOESNT_CONTAIN<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> test_trace_check_ignores_leading_whitespace<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L14" class="LineNr"> 14 </span>  trace<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>  CHECK_EQ<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>  CHECK_EQ<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> test_trace_check_ignores_other_lines<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L20" class="LineNr"> 20 </span>  trace<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>  trace<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>  CHECK_TRACE_CONTENTS<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> test_trace_check_ignores_other_lines2<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L26" class="LineNr"> 26 </span>  trace<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>  trace<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>  CHECK_TRACE_CONTENTS<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> test_trace_ignores_trailing_whitespace<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr"> 32 </span>  trace<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>  CHECK_TRACE_CONTENTS<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> test_trace_ignores_trailing_whitespace2<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L37" class="LineNr"> 37 </span>  trace<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>  CHECK_TRACE_CONTENTS<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> test_trace_orders_across_layers<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L42" class="LineNr"> 42 </span>  trace<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>  trace<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>  trace<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>  CHECK_TRACE_CONTENTS<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> test_trace_supports_count<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L49" class="LineNr"> 49 </span>  trace<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>  trace<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>  CHECK_EQ<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> test_trace_supports_count2<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L55" class="LineNr"> 55 </span>  trace<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>  trace<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>  CHECK_EQ<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> test_trace_count_ignores_trailing_whitespace<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L61" class="LineNr"> 61 </span>  trace<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>  CHECK_EQ<span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">&quot;test layer 1&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;foo&quot;</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
+<span id="L64" class="LineNr"> 64 </span>
+<span id="L65" class="LineNr"> 65 </span><span class="Comment">// pending: DUMP tests</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Comment">// pending: readable_contents() adds newline if necessary.</span>
+<span id="L67" class="LineNr"> 67 </span><span class="Comment">// pending: raise also prints to stderr.</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Comment">// pending: raise doesn't print to stderr if Hide_errors is set.</span>
+<span id="L69" class="LineNr"> 69 </span><span class="Comment">// pending: raise doesn't have to be saved if Hide_errors is set, just printed.</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">// pending: raise prints to stderr if Trace_stream is NULL.</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment">// pending: raise prints to stderr if Trace_stream is NULL even if Hide_errors is set.</span>
+<span id="L72" class="LineNr"> 72 </span>
+<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> test_split_returns_at_least_one_elem<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>  vector&lt;string&gt; result = split<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>  CHECK_EQ<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>  CHECK_EQ<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> test_split_returns_entire_input_when_no_delim<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L82" class="LineNr"> 82 </span>  vector&lt;string&gt; result = split<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>  CHECK_EQ<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>  CHECK_EQ<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> test_split_works<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L88" class="LineNr"> 88 </span>  vector&lt;string&gt; result = split<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>  CHECK_EQ<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>  CHECK_EQ<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>  CHECK_EQ<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> test_split_works2<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>  vector&lt;string&gt; result = split<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>  CHECK_EQ<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>  CHECK_EQ<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>  CHECK_EQ<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="L99" class="LineNr"> 99 </span>  CHECK_EQ<span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">&quot;ghi&quot;</span><span class="Delimiter">);</span>
+<span id="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> test_split_handles_multichar_delim<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L103" class="LineNr">103 </span>  vector&lt;string&gt; result = split<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>  CHECK_EQ<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>  CHECK_EQ<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>  CHECK_EQ<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="L107" class="LineNr">107 </span>  CHECK_EQ<span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">&quot;ghi&quot;</span><span class="Delimiter">);</span>
+<span id="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> test_trim<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L111" class="LineNr">111 </span>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>  CHECK_EQ<span class="Delimiter">(</span>trim<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>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html
index 606d4dec..8d7cb3a2 100644
--- a/html/subx/010core.cc.html
+++ b/html/subx/010core.cc.html
@@ -80,10 +80,10 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr"> 17 </span>  <span class="Normal">uint32_t</span> u<span class="Delimiter">;</span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">};</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L20" class="LineNr"> 20 </span>reg R[NUM_INT_REGISTERS] = <span class="Delimiter">{</span> <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">}</span> <span class="Delimiter">};</span>
+<span id="L20" class="LineNr"> 20 </span>reg Reg[NUM_INT_REGISTERS] = <span class="Delimiter">{</span> <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">}</span> <span class="Delimiter">};</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Normal">uint32_t</span> EIP = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L23" class="LineNr"> 23 </span>bzero<span class="Delimiter">(</span>R<span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span>R<span class="Delimiter">));</span>
+<span id="L23" class="LineNr"> 23 </span>bzero<span class="Delimiter">(</span>Reg<span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span>Reg<span class="Delimiter">));</span>
 <span id="L24" class="LineNr"> 24 </span>EIP = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L25" class="LineNr"> 25 </span>
 <span id="L26" class="LineNr"> 26 </span><span class="SalientComment">//:: simulated flag registers; just a subset that we care about</span>
@@ -103,146 +103,185 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr"> 40 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span><span class="PreProc"> \</span>
 <span id="L41" class="LineNr"> 41 </span><span class="PreProc">  </span><span class="Normal">int64_t</span><span class="PreProc"> tmp = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
 <span id="L42" class="LineNr"> 42 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L43" class="LineNr"> 43 </span><span class="PreProc">  SF = (arg1 &lt; </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L44" class="LineNr"> 44 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L45" class="LineNr"> 45 </span><span class="PreProc">  OF = (arg1 != tmp)</span><span class="Delimiter">;</span><span class="PreProc"> \</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="PreProc">#define BINARY_BITWISE_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
-<span id="L49" class="LineNr"> 49 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span><span class="PreProc"> \</span>
-<span id="L50" class="LineNr"> 50 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L51" class="LineNr"> 51 </span><span class="PreProc">  SF = (arg1 &gt;&gt; </span><span class="Constant">31</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L52" class="LineNr"> 52 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L53" class="LineNr"> 53 </span><span class="PreProc">  OF = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span>
-<span id="L55" class="LineNr"> 55 </span>
-<span id="L56" class="LineNr"> 56 </span><span class="SalientComment">//:: simulated RAM</span>
+<span id="L43" class="LineNr"> 43 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; HEXWORD &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L44" class="LineNr"> 44 </span><span class="PreProc">  SF = (arg1 &lt; </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L45" class="LineNr"> 45 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L46" class="LineNr"> 46 </span><span class="PreProc">  OF = (arg1 != tmp)</span><span class="Delimiter">;</span><span class="PreProc"> \</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="PreProc">#define BINARY_BITWISE_OP(op</span><span class="Delimiter">,</span><span class="PreProc"> arg1</span><span class="Delimiter">,</span><span class="PreProc"> arg2) </span><span class="Delimiter">{</span><span class="PreProc"> \</span>
+<span id="L50" class="LineNr"> 50 </span><span class="PreProc">  </span><span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span><span class="PreProc"> \</span>
+<span id="L51" class="LineNr"> 51 </span><span class="PreProc">  arg1 = arg1 op arg2</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L52" class="LineNr"> 52 </span><span class="PreProc">  trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">&quot;run&quot;</span><span class="PreProc">) &lt;&lt; </span><span class="Constant">&quot;storing 0x&quot;</span><span class="PreProc"> &lt;&lt; HEXWORD &lt;&lt; arg1 &lt;&lt; end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L53" class="LineNr"> 53 </span><span class="PreProc">  SF = (arg1 &gt;&gt; </span><span class="Constant">31</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L54" class="LineNr"> 54 </span><span class="PreProc">  ZF = (arg1 == </span><span class="Constant">0</span><span class="PreProc">)</span><span class="Delimiter">;</span><span class="PreProc"> \</span>
+<span id="L55" class="LineNr"> 55 </span><span class="PreProc">  OF = </span><span class="Constant">false</span><span class="Delimiter">;</span><span class="PreProc"> \</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="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L59" class="LineNr"> 59 </span>map&lt;<span class="Normal">uint32_t</span><span class="Delimiter">,</span> <span class="Normal">uint8_t</span>&gt; Memory<span class="Delimiter">;</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Normal">uint32_t</span> End_of_program = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
-<span id="L62" class="LineNr"> 62 </span>Memory<span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
-<span id="L63" class="LineNr"> 63 </span>End_of_program = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="SalientComment">//:: core interpreter loop</span>
-<span id="L66" class="LineNr"> 66 </span>
-<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment"># In scenarios, programs are a series of hex bytes, each (variable-length)</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment"># instruction on one line.</span>
-<span id="L70" class="LineNr"> 70 </span>#
-<span id="L71" class="LineNr"> 71 </span><span class="Comment"># x86 instructions consist of the following parts (see cheatsheet.pdf):</span>
-<span id="L72" class="LineNr"> 72 </span><span class="Comment">#   opcode        ModRM                 SIB                   displacement    immediate</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">#   instruction   mod, reg, R/M bits    scale, index, base</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Comment">#   1-3 bytes     0/1 byte              0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Conceal">¦</span> <span class="Constant">0x05</span>                                                                      0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
-<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+load: 1 -&gt; 05</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+load: 2 -&gt; 0a</span>
-<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+load: 3 -&gt; 0b</span>
-<span id="L79" class="LineNr"> 79 </span><span class="traceContains">+load: 4 -&gt; 0c</span>
-<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+load: 5 -&gt; 0d</span>
-<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to reg EAX</span>
-<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+reg: storing 0x0d0c0b0a in reg EAX</span>
-<span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span><span class="Delimiter">:(code)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="Comment">// helper for tests: load a program into memory from a textual representation</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Comment">// of its bytes, and run it</span>
-<span id="L87" class="LineNr"> 87 </span><span class="Normal">void</span> run<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L88" class="LineNr"> 88 </span>  load_program<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>  EIP = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// preserve null pointer</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>EIP &lt; End_of_program<span class="Delimiter">)</span>
-<span id="L91" class="LineNr"> 91 </span>  <span class="Conceal">¦</span> run_one_instruction<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> load_program<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">// we'll use C's 'strtol` to parse ASCII hex bytes</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Comment">// strtol needs a char*, so we grab the buffer backing the string object</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Normal">char</span>* curr = <span class="Normal">const_cast</span>&lt;<span class="Normal">char</span>*&gt;<span class="Delimiter">(</span>&amp;text_bytes[<span class="Constant">0</span>]<span class="Delimiter">);</span>   <span class="Comment">// non-portable, but blessed by Herb Sutter (<a href="http://herbsutter.com/2008/04/07/cringe-not-vectors-are-guaranteed-to-be-contiguous/#comment-483)">http://herbsutter.com/2008/04/07/cringe-not-vectors-are-guaranteed-to-be-contiguous/#comment-483)</a></span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">char</span>* max = curr + strlen<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>curr &lt; max<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Conceal">¦</span> <span class="Comment">// skip whitespace</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>*curr == <span class="Constant">' '</span> || *curr == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> ++curr<span class="Delimiter">;</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> <span class="Comment">// skip comments</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>*curr != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr<span class="Delimiter">;</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr &gt;= max<span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> ++curr<span class="Delimiter">;</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Conceal">¦</span> put<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr<span class="Delimiter">,</span> strtol<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> &amp;curr<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">hex</span><span class="Comment">*/</span><span class="Constant">16</span><span class="Delimiter">));</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; HEXBYTE &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">unsigned</span> <span class="Normal">int</span>&gt;<span class="Delimiter">(</span>get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>  <span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> addr++<span class="Delimiter">;</span>
-<span id="L115" class="LineNr">115 </span>  <span class="Delimiter">}</span>
-<span id="L116" class="LineNr">116 </span>  End_of_program = addr<span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
-<span id="L118" class="LineNr">118 </span>
-<span id="L119" class="LineNr">119 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span>
-<span id="L120" class="LineNr">120 </span><span class="Normal">void</span> run_one_instruction<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L121" class="LineNr">121 </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="L122" class="LineNr">122 </span>  <span class="Normal">switch</span><span class="Delimiter">(</span>op = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Comment">// our first opcode</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> EIP = End_of_program<span class="Delimiter">;</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span>  <span class="Conceal">¦</span> <span class="Normal">int32_t</span> arg2 = imm32<span class="Delimiter">();</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to reg EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Conceal">¦</span> BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>+<span class="Delimiter">,</span> R[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">98</span><span class="Delimiter">,</span> <span class="Constant">&quot;reg&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;storing 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; R[EAX]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in reg EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Delimiter">}</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Comment">// End Single-Byte Opcodes</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L137" class="LineNr">137 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; std::hex &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
-<span id="L144" class="LineNr">144 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L145" class="LineNr">145 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0x0f</span>:
-<span id="L147" class="LineNr">147 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; std::hex &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
-<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; std::hex &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Normal">default</span>:
-<span id="L160" class="LineNr">160 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; std::hex &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">int</span>&gt;<span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span><span class="SalientComment">//:: simulated RAM</span>
+<span id="L59" class="LineNr"> 59 </span>
+<span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L61" class="LineNr"> 61 </span>vector&lt;<span class="Normal">uint8_t</span>&gt; Mem<span class="Delimiter">;</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Normal">uint32_t</span> End_of_program = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L63" class="LineNr"> 63 </span><span class="Delimiter">:(before &quot;End Reset&quot;)</span>
+<span id="L64" class="LineNr"> 64 </span>Mem<span class="Delimiter">.</span>clear<span class="Delimiter">();</span>
+<span id="L65" class="LineNr"> 65 </span>Mem<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1024</span><span class="Delimiter">);</span>
+<span id="L66" class="LineNr"> 66 </span>End_of_program = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L67" class="LineNr"> 67 </span>
+<span id="L68" class="LineNr"> 68 </span><span class="SalientComment">//:: core interpreter loop</span>
+<span id="L69" class="LineNr"> 69 </span>
+<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment"># In scenarios, programs are a series of hex bytes, each (variable-length)</span>
+<span id="L72" class="LineNr"> 72 </span><span class="Comment"># instruction on one line.</span>
+<span id="L73" class="LineNr"> 73 </span>#
+<span id="L74" class="LineNr"> 74 </span><span class="Comment"># x86 instructions consist of the following parts (see cheatsheet.pdf):</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Comment">#   opcode        ModR/M                    SIB                   displacement    immediate</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">#   instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
+<span id="L77" class="LineNr"> 77 </span><span class="Comment">#   1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Conceal">¦</span> <span class="PreProc">0</span><span class="Constant">5</span>                                                                            0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EAX</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment"># All hex bytes must be exactly 2 characters each. No '0x' prefixes.</span>
+<span id="L80" class="LineNr"> 80 </span><span class="traceContains">+load: 1 -&gt; 05</span>
+<span id="L81" class="LineNr"> 81 </span><span class="traceContains">+load: 2 -&gt; 0a</span>
+<span id="L82" class="LineNr"> 82 </span><span class="traceContains">+load: 3 -&gt; 0b</span>
+<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+load: 4 -&gt; 0c</span>
+<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+load: 5 -&gt; 0d</span>
+<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to reg EAX</span>
+<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(code)</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Comment">// helper for tests: load a program into memory from a textual representation</span>
+<span id="L90" class="LineNr"> 90 </span><span class="Comment">// of its bytes, and run it</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> run<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L92" class="LineNr"> 92 </span>  load_program<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  EIP = <span class="Constant">1</span><span class="Delimiter">;</span>  <span class="Comment">// preserve null pointer</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>EIP &lt; End_of_program<span class="Delimiter">)</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Conceal">¦</span> run_one_instruction<span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">}</span>
+<span id="L97" class="LineNr"> 97 </span>
+<span id="L98" class="LineNr"> 98 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Normal">void</span> run_one_instruction<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L100" class="LineNr">100 </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="L101" class="LineNr">101 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>op = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">case</span> <span class="Constant">0xf4</span>:  <span class="Comment">// hlt</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Conceal">¦</span> EIP = End_of_program<span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L105" class="LineNr">105 </span>  <span class="Comment">// our first opcode</span>
+<span id="L106" class="LineNr">106 </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="L107" class="LineNr">107 </span>  <span class="Conceal">¦</span> <span class="Normal">int32_t</span> arg2 = imm32<span class="Delimiter">();</span>
+<span id="L108" class="LineNr">108 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to reg EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Conceal">¦</span> BINARY_ARITHMETIC_OP<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="L110" class="LineNr">110 </span>  <span class="Conceal">¦</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="Comment">// End Single-Byte Opcodes</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L114" class="LineNr">114 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span>
+<span id="L116" class="LineNr">116 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L117" class="LineNr">117 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after 0f: &quot;</span> &lt;&lt; HEXBYTE &lt;&lt; NUM<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L120" class="LineNr">120 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">case</span> <span class="Constant">0xf3</span>:
+<span id="L122" class="LineNr">122 </span>  <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Conceal">¦</span> <span class="Comment">// End Two-Byte Opcodes Starting With f3</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Conceal">¦</span> <span class="Normal">case</span> <span class="Constant">0x0f</span>:
+<span id="L125" class="LineNr">125 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L128" class="LineNr">128 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized third opcode after f3 0f: &quot;</span> &lt;&lt; HEXBYTE &lt;&lt; NUM<span class="Delimiter">(</span>op3<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </span>  <span class="Conceal">¦</span> <span class="Normal">default</span>:
+<span id="L133" class="LineNr">133 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized second opcode after f3: &quot;</span> &lt;&lt; HEXBYTE &lt;&lt; NUM<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L136" class="LineNr">136 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Normal">default</span>:
+<span id="L138" class="LineNr">138 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized opcode: &quot;</span> &lt;&lt; HEXBYTE &lt;&lt; NUM<span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span><span class="Normal">void</span> load_program<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Normal">uint32_t</span> addr = <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L145" class="LineNr">145 </span>  istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span>
+<span id="L146" class="LineNr">146 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">while</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>  <span class="Conceal">¦</span> <span class="Normal">char</span> c1 = next_hex_byte<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c1 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> raise &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L153" class="LineNr">153 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c2 = next_hex_byte<span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c2 == <span class="cSpecial">'\0'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> raise &lt;&lt; <span class="Constant">&quot;input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Conceal">¦</span> Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> = to_byte<span class="Delimiter">(</span>c1<span class="Delimiter">,</span> c2<span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; -&gt; &quot;</span> &lt;&lt; HEXBYTE &lt;&lt; NUM<span class="Delimiter">(</span>Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L161" class="LineNr">161 </span>  <span class="Conceal">¦</span> addr++<span class="Delimiter">;</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</span>
-<span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Normal">uint8_t</span> next<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Identifier">return</span> get_or_insert<span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> EIP++<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="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
-<span id="L170" class="LineNr">170 </span><span class="Normal">int32_t</span> imm32<span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Normal">int32_t</span> result = next<span class="Delimiter">();</span>
-<span id="L172" class="LineNr">172 </span>  result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>  result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Identifier">return</span> result<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="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L179" class="LineNr">179 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
-<span id="L180" class="LineNr">180 </span><span class="PreProc">#define HEXBYTE  std::hex &lt;&lt; std::setw(</span><span class="Constant">2</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
-<span id="L181" class="LineNr">181 </span><span class="PreProc">#define HEXWORD  std::hex &lt;&lt; std::setw(</span><span class="Constant">8</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
-<span id="L182" class="LineNr">182 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</span>
+<span id="L163" class="LineNr">163 </span>  End_of_program = addr<span class="Delimiter">;</span>
+<span id="L164" class="LineNr">164 </span><span class="Delimiter">}</span>
+<span id="L165" class="LineNr">165 </span>
+<span id="L166" class="LineNr">166 </span><span class="Normal">char</span> next_hex_byte<span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Conceal">¦</span> <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span>
+<span id="L169" class="LineNr">169 </span>  <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">' '</span> || c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L173" class="LineNr">173 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L174" class="LineNr">174 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L177" class="LineNr">177 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L178" class="LineNr">178 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L179" class="LineNr">179 </span>  <span class="Conceal">¦</span> <span class="Delimiter">}</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c<span class="Delimiter">;</span>
+<span id="L182" class="LineNr">182 </span>  <span class="Conceal">¦</span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'A'</span> &amp;&amp; c &lt;= <span class="Constant">'F'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> tolower<span class="Delimiter">(</span>c<span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>  <span class="Conceal">¦</span> <span class="Comment">// disallow any non-hex characters, including a '0x' prefix</span>
+<span id="L184" class="LineNr">184 </span>  <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>c<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L185" class="LineNr">185 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> raise &lt;&lt; <span class="Constant">&quot;invalid non-hex character '&quot;</span> &lt;&lt; c &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="L186" class="LineNr">186 </span>  <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Conceal">¦</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="Identifier">return</span> <span class="cSpecial">'\0'</span><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="Normal">uint8_t</span> to_byte<span class="Delimiter">(</span><span class="Normal">char</span> hex_byte1<span class="Delimiter">,</span> <span class="Normal">char</span> hex_byte2<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Identifier">return</span> to_hex_num<span class="Delimiter">(</span>hex_byte1<span class="Delimiter">)</span>*<span class="Constant">16</span> + to_hex_num<span class="Delimiter">(</span>hex_byte2<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">uint8_t</span> to_hex_num<span class="Delimiter">(</span><span class="Normal">char</span> c<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'0'</span> &amp;&amp; c &lt;= <span class="Constant">'9'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'0'</span><span class="Delimiter">;</span>
+<span id="L197" class="LineNr">197 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>c &gt;= <span class="Constant">'a'</span> &amp;&amp; c &lt;= <span class="Constant">'f'</span><span class="Delimiter">)</span> <span class="Identifier">return</span> c - <span class="Constant">'a'</span> + <span class="Constant">10</span><span class="Delimiter">;</span>
+<span id="L198" class="LineNr">198 </span>  assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L200" class="LineNr">200 </span><span class="Delimiter">}</span>
+<span id="L201" class="LineNr">201 </span>
+<span id="L202" class="LineNr">202 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> next<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Identifier">return</span> Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span><span class="Delimiter">}</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
+<span id="L207" class="LineNr">207 </span><span class="Normal">int32_t</span> imm32<span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Normal">int32_t</span> result = next<span class="Delimiter">();</span>
+<span id="L209" class="LineNr">209 </span>  result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>  result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span>&lt;&lt;<span class="Constant">24</span><span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span>
+<span id="L214" class="LineNr">214 </span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L216" class="LineNr">216 </span><span class="PreProc">#include </span><span class="Constant">&lt;iomanip&gt;</span>
+<span id="L217" class="LineNr">217 </span><span class="PreProc">#define HEXBYTE  std::hex &lt;&lt; std::setw(</span><span class="Constant">2</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
+<span id="L218" class="LineNr">218 </span><span class="PreProc">#define HEXWORD  std::hex &lt;&lt; std::setw(</span><span class="Constant">8</span><span class="PreProc">) &lt;&lt; std::setfill(</span><span class="Constant">'0'</span><span class="PreProc">)</span>
+<span id="L219" class="LineNr">219 </span><span class="Comment">// ugly that iostream doesn't print uint8_t as an integer</span>
+<span id="L220" class="LineNr">220 </span><span class="PreProc">#define NUM(X) </span><span class="Normal">static_cast</span><span class="PreProc">&lt;</span><span class="Normal">int</span><span class="PreProc">&gt;(X)</span>
+<span id="L221" class="LineNr">221 </span><span class="PreProc">#include </span><span class="Constant">&lt;stdint.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html
new file mode 100644
index 00000000..f6b8edc6
--- /dev/null
+++ b/html/subx/011direct_addressing.cc.html
@@ -0,0 +1,132 @@
+<!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/011direct_addressing.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
+.traceContains { 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">//: operating directly on a register</span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(scenario add_r32_to_r32)</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Special">% Reg[0].i = 0x10;</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Special">% Reg[3].i = 1;</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L7" class="LineNr"> 7 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  d8                                      <span class="Comment"># add EBX (reg 3) to EAX (reg 0)</span>
+<span id="L8" class="LineNr"> 8 </span><span class="traceContains">+run: add reg 3 to effective address</span>
+<span id="L9" class="LineNr"> 9 </span><span class="traceContains">+run: effective address is reg 0</span>
+<span id="L10" class="LineNr">10 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L11" class="LineNr">11 </span>
+<span id="L12" class="LineNr">12 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L13" class="LineNr">13 </span><span class="Normal">case</span> <span class="Constant">0x01</span>: <span class="Delimiter">{</span>  <span class="Comment">// add r32 to r/m32</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span>
+<span id="L15" class="LineNr">15 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L16" class="LineNr">16 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add reg &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to effective address&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L17" class="LineNr">17 </span>  <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L18" class="LineNr">18 </span>  BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L20" class="LineNr">20 </span><span class="Delimiter">}</span>
+<span id="L21" class="LineNr">21 </span>
+<span id="L22" class="LineNr">22 </span><span class="Delimiter">:(code)</span>
+<span id="L23" class="LineNr">23 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span>
+<span id="L24" class="LineNr">24 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span>
+<span id="L25" class="LineNr">25 </span><span class="Comment">// 'Mem' at once.</span>
+<span id="L26" class="LineNr">26 </span><span class="Normal">int32_t</span>* effective_address<span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L27" class="LineNr">27 </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="L28" class="LineNr">28 </span>  <span class="Comment">// ignore middle 3 'reg opcode' bits</span>
+<span id="L29" class="LineNr">29 </span>  <span class="Normal">uint8_t</span> rm = modrm &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L30" class="LineNr">30 </span>  <span class="Normal">int32_t</span>* result = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr">32 </span>  <span class="Normal">case</span> <span class="Constant">3</span>:
+<span id="L33" class="LineNr">33 </span>  <span class="Conceal">¦</span> <span class="Comment">// mod 3 is just register direct addressing</span>
+<span id="L34" class="LineNr">34 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is reg &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L35" class="LineNr">35 </span>  <span class="Conceal">¦</span> result = &amp;Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L36" class="LineNr">36 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Comment">// End Mod Special-cases</span>
+<span id="L38" class="LineNr">38 </span>  <span class="Normal">default</span>:
+<span id="L39" class="LineNr">39 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized mod bits: &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>mod<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L40" class="LineNr">40 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L41" class="LineNr">41 </span>  <span class="Delimiter">}</span>
+<span id="L42" class="LineNr">42 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span>
+<span id="L44" class="LineNr">44 </span>
+<span id="L45" class="LineNr">45 </span><span class="SalientComment">//:: subtract</span>
+<span id="L46" class="LineNr">46 </span>
+<span id="L47" class="LineNr">47 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span>
+<span id="L48" class="LineNr">48 </span><span class="Special">% Reg[0].i = 10;</span>
+<span id="L49" class="LineNr">49 </span><span class="Special">% Reg[3].i = 1;</span>
+<span id="L50" class="LineNr">50 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L51" class="LineNr">51 </span>  <span class="Constant">29</span>  d8                                      <span class="Comment"># subtract EBX (reg 3) from EAX (reg 0)</span>
+<span id="L52" class="LineNr">52 </span><span class="traceContains">+run: subtract reg 3 from effective address</span>
+<span id="L53" class="LineNr">53 </span><span class="traceContains">+run: effective address is reg 0</span>
+<span id="L54" class="LineNr">54 </span><span class="traceContains">+run: storing 0x00000009</span>
+<span id="L55" class="LineNr">55 </span>
+<span id="L56" class="LineNr">56 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L57" class="LineNr">57 </span><span class="Normal">case</span> <span class="Constant">0x29</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract r32 from r/m32</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span>
+<span id="L59" class="LineNr">59 </span>  <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L60" class="LineNr">60 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract reg &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; from effective address&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L61" class="LineNr">61 </span>  <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L62" class="LineNr">62 </span>  BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span>
+<span id="L63" class="LineNr">63 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L64" class="LineNr">64 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html
new file mode 100644
index 00000000..ef919f1d
--- /dev/null
+++ b/html/subx/012indirect_addressing.cc.html
@@ -0,0 +1,148 @@
+<!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/012indirect_addressing.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.traceContains { 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">//: operating on memory at the address provided by some register</span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32)</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Special">% Reg[3].i = 0x10;</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Special">% Reg[0].i = 0x60;</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># word in addresses 0x60-0x63 has value 1</span>
+<span id="L7" class="LineNr"> 7 </span><span class="Special">% Mem.at(0x60) = 1;</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L9" class="LineNr"> 9 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">18</span>                                     <span class="Comment"># add EBX (reg 3) to *EAX (reg 0)</span>
+<span id="L10" class="LineNr">10 </span><span class="traceContains">+run: add reg 3 to effective address</span>
+<span id="L11" class="LineNr">11 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
+<span id="L12" class="LineNr">12 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L13" class="LineNr">13 </span>
+<span id="L14" class="LineNr">14 </span><span class="Delimiter">:(before &quot;End Mod Special-cases&quot;)</span>
+<span id="L15" class="LineNr">15 </span><span class="Normal">case</span> <span class="Constant">0</span>:
+<span id="L16" class="LineNr">16 </span>  <span class="Comment">// mod 0 is usually indirect addressing</span>
+<span id="L17" class="LineNr">17 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L18" class="LineNr">18 </span>  <span class="Normal">default</span>:
+<span id="L19" class="LineNr">19 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;effective address is mem at address 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; Reg[rm]<span class="Delimiter">.</span>u &lt;&lt; <span class="Constant">&quot; (reg &quot;</span> &lt;&lt; NUM<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="L20" class="LineNr">20 </span>  <span class="Conceal">¦</span> assert<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span>u + <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int32_t</span><span class="Delimiter">)</span> &lt;= Mem<span class="Delimiter">.</span>size<span class="Delimiter">());</span>
+<span id="L21" class="LineNr">21 </span>  <span class="Conceal">¦</span> result = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">int32_t</span>*&gt;<span class="Delimiter">(</span>&amp;Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">));</span>  <span class="Comment">// rely on the host itself being in little-endian order</span>
+<span id="L22" class="LineNr">22 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment">// End Mod 0 Special-cases</span>
+<span id="L24" class="LineNr">24 </span>  <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 id="L27" class="LineNr">27 </span><span class="Comment">//:</span>
+<span id="L28" class="LineNr">28 </span>
+<span id="L29" class="LineNr">29 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span>
+<span id="L30" class="LineNr">30 </span><span class="Special">% Reg[0].i = 0x60;</span>
+<span id="L31" class="LineNr">31 </span><span class="Special">% Reg[3].i = 0x10;</span>
+<span id="L32" class="LineNr">32 </span><span class="Special">% Mem.at(0x60) = 1;</span>
+<span id="L33" class="LineNr">33 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L34" class="LineNr">34 </span>  <span class="PreProc">0</span><span class="Constant">3</span>  <span class="Constant">18</span>                                      <span class="Comment"># add *EAX (reg 0) to EBX (reg 3)</span>
+<span id="L35" class="LineNr">35 </span><span class="traceContains">+run: add effective address to reg 3</span>
+<span id="L36" class="LineNr">36 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
+<span id="L37" class="LineNr">37 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L38" class="LineNr">38 </span>
+<span id="L39" class="LineNr">39 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L40" class="LineNr">40 </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="L41" class="LineNr">41 </span>  <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span>
+<span id="L42" class="LineNr">42 </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="L43" class="LineNr">43 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add effective address to reg &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L44" class="LineNr">44 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L45" class="LineNr">45 </span>  BINARY_ARITHMETIC_OP<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="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 id="L49" class="LineNr">49 </span><span class="SalientComment">//:: subtract</span>
+<span id="L50" class="LineNr">50 </span>
+<span id="L51" class="LineNr">51 </span><span class="Delimiter">:(scenario sub_r32_from_mem_at_r32)</span>
+<span id="L52" class="LineNr">52 </span><span class="Special">% Reg[0].i = 0x60;</span>
+<span id="L53" class="LineNr">53 </span><span class="Special">% Mem.at(0x60) = 10;</span>
+<span id="L54" class="LineNr">54 </span><span class="Special">% Reg[3].i = 1;</span>
+<span id="L55" class="LineNr">55 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Constant">29</span>  <span class="Constant">18</span>                                      <span class="Comment"># subtract EBX (reg 3) from *EAX (reg 0)</span>
+<span id="L57" class="LineNr">57 </span><span class="traceContains">+run: subtract reg 3 from effective address</span>
+<span id="L58" class="LineNr">58 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
+<span id="L59" class="LineNr">59 </span><span class="traceContains">+run: storing 0x00000009</span>
+<span id="L60" class="LineNr">60 </span>
+<span id="L61" class="LineNr">61 </span><span class="Comment">//:</span>
+<span id="L62" class="LineNr">62 </span>
+<span id="L63" class="LineNr">63 </span><span class="Delimiter">:(scenario sub_mem_at_r32_from_r32)</span>
+<span id="L64" class="LineNr">64 </span><span class="Special">% Reg[0].i = 0x60;</span>
+<span id="L65" class="LineNr">65 </span><span class="Special">% Mem.at(0x60) = 1;</span>
+<span id="L66" class="LineNr">66 </span><span class="Special">% Reg[3].i = 10;</span>
+<span id="L67" class="LineNr">67 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L68" class="LineNr">68 </span>  2b  <span class="Constant">18</span>                                      <span class="Comment"># subtract *EAX (reg 0) from EBX (reg 3)</span>
+<span id="L69" class="LineNr">69 </span><span class="traceContains">+run: subtract effective address from reg 3</span>
+<span id="L70" class="LineNr">70 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 0)</span>
+<span id="L71" class="LineNr">71 </span><span class="traceContains">+run: storing 0x00000009</span>
+<span id="L72" class="LineNr">72 </span>
+<span id="L73" class="LineNr">73 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L74" class="LineNr">74 </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="L75" class="LineNr">75 </span>  <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span>
+<span id="L76" class="LineNr">76 </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="L77" class="LineNr">77 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract effective address from reg &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L78" class="LineNr">78 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L79" class="LineNr">79 </span>  BINARY_ARITHMETIC_OP<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="L80" class="LineNr">80 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L81" class="LineNr">81 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html
new file mode 100644
index 00000000..f70ab384
--- /dev/null
+++ b/html/subx/013immediate_addressing.cc.html
@@ -0,0 +1,157 @@
+<!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/013immediate_addressing.cc</title>
+<meta name="Generator" content="Vim/7.4">
+<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; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
+.Conceal { color: #4e4e4e; }
+.SalientComment { color: #00ffff; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Delimiter { color: #800080; }
+.LineNr { color: #444444; }
+.Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.PreProc { color: #800080; }
+.cSpecial { color: #008000; }
+.traceContains { 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">//: 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">:(scenario add_imm32_to_r32)</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Special">% Reg[3].i = 1;</span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L6" class="LineNr"> 6 </span>  <span class="Constant">81</span>  c3                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EBX (reg 3)</span>
+<span id="L7" class="LineNr"> 7 </span><span class="traceContains">+run: combine imm32 0x0d0c0b0a with effective address</span>
+<span id="L8" class="LineNr"> 8 </span><span class="traceContains">+run: effective address is reg 3</span>
+<span id="L9" class="LineNr"> 9 </span><span class="traceContains">+run: subop add</span>
+<span id="L10" class="LineNr">10 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
+<span id="L11" class="LineNr">11 </span>
+<span id="L12" class="LineNr">12 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L13" class="LineNr">13 </span><span class="Normal">case</span> <span class="Constant">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span>
+<span id="L15" class="LineNr">15 </span>  <span class="Normal">int32_t</span> arg2 = imm32<span class="Delimiter">();</span>
+<span id="L16" class="LineNr">16 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with effective address&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L17" class="LineNr">17 </span>  <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L18" class="LineNr">18 </span>  <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L20" class="LineNr">20 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
+<span id="L21" class="LineNr">21 </span>  <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop add&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L22" class="LineNr">22 </span>  <span class="Conceal">¦</span> BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L24" class="LineNr">24 </span>  <span class="Comment">// End Op 81 Subops</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Normal">default</span>:
+<span id="L26" class="LineNr">26 </span>  <span class="Conceal">¦</span> cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; NUM<span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L28" class="LineNr">28 </span>  <span class="Delimiter">}</span>
+<span id="L29" class="LineNr">29 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L30" class="LineNr">30 </span><span class="Delimiter">}</span>
+<span id="L31" class="LineNr">31 </span>
+<span id="L32" class="LineNr">32 </span><span class="Comment">//:</span>
+<span id="L33" class="LineNr">33 </span>
+<span id="L34" class="LineNr">34 </span><span class="Delimiter">:(scenario add_imm32_to_mem_at_r32)</span>
+<span id="L35" class="LineNr">35 </span><span class="Special">% Reg[3].i = 0x60;</span>
+<span id="L36" class="LineNr">36 </span><span class="Special">% Mem.at(0x60) = 1;</span>
+<span id="L37" class="LineNr">37 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L38" class="LineNr">38 </span>  <span class="Constant">81</span>  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to *EBX (reg 3)</span>
+<span id="L39" class="LineNr">39 </span><span class="traceContains">+run: combine imm32 0x0d0c0b0a with effective address</span>
+<span id="L40" class="LineNr">40 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
+<span id="L41" class="LineNr">41 </span><span class="traceContains">+run: subop add</span>
+<span id="L42" class="LineNr">42 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
+<span id="L43" class="LineNr">43 </span>
+<span id="L44" class="LineNr">44 </span><span class="SalientComment">//:: subtract</span>
+<span id="L45" class="LineNr">45 </span>
+<span id="L46" class="LineNr">46 </span><span class="Delimiter">:(scenario sub_imm32_from_eax)</span>
+<span id="L47" class="LineNr">47 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
+<span id="L48" class="LineNr">48 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L49" class="LineNr">49 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX (reg 0)</span>
+<span id="L50" class="LineNr">50 </span><span class="traceContains">+run: subtract imm32 0x0d0c0b0a from reg EAX</span>
+<span id="L51" class="LineNr">51 </span><span class="traceContains">+run: storing 0x000000a0</span>
+<span id="L52" class="LineNr">52 </span>
+<span id="L53" class="LineNr">53 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L54" class="LineNr">54 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
+<span id="L55" class="LineNr">55 </span>  <span class="Normal">int32_t</span> arg2 = imm32<span class="Delimiter">();</span>
+<span id="L56" class="LineNr">56 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; HEXWORD &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from reg EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L57" class="LineNr">57 </span>  BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L59" class="LineNr">59 </span><span class="Delimiter">}</span>
+<span id="L60" class="LineNr">60 </span>
+<span id="L61" class="LineNr">61 </span><span class="Comment">//:</span>
+<span id="L62" class="LineNr">62 </span>
+<span id="L63" class="LineNr">63 </span><span class="Delimiter">:(scenario sub_imm32_from_mem_at_r32)</span>
+<span id="L64" class="LineNr">64 </span><span class="Special">% Reg[3].i = 0x60;</span>
+<span id="L65" class="LineNr">65 </span><span class="Special">% Mem.at(0x60) = 10;</span>
+<span id="L66" class="LineNr">66 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L67" class="LineNr">67 </span>  <span class="Constant">81</span>  2b                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from *EBX (reg 3)</span>
+<span id="L68" class="LineNr">68 </span><span class="traceContains">+run: combine imm32 0x00000001 with effective address</span>
+<span id="L69" class="LineNr">69 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span>
+<span id="L70" class="LineNr">70 </span><span class="traceContains">+run: subop subtract</span>
+<span id="L71" class="LineNr">71 </span><span class="traceContains">+run: storing 0x00000009</span>
+<span id="L72" class="LineNr">72 </span>
+<span id="L73" class="LineNr">73 </span><span class="Comment">//:</span>
+<span id="L74" class="LineNr">74 </span>
+<span id="L75" class="LineNr">75 </span><span class="Delimiter">:(scenario sub_imm32_from_r32)</span>
+<span id="L76" class="LineNr">76 </span><span class="Special">% Reg[3].i = 10;</span>
+<span id="L77" class="LineNr">77 </span><span class="Comment"># op  ModRM   SIB   displacement  immediate</span>
+<span id="L78" class="LineNr">78 </span>  <span class="Constant">81</span>  eb                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from EBX (reg 3)</span>
+<span id="L79" class="LineNr">79 </span><span class="traceContains">+run: combine imm32 0x00000001 with effective address</span>
+<span id="L80" class="LineNr">80 </span><span class="traceContains">+run: effective address is reg 3</span>
+<span id="L81" class="LineNr">81 </span><span class="traceContains">+run: subop subtract</span>
+<span id="L82" class="LineNr">82 </span><span class="traceContains">+run: storing 0x00000009</span>
+<span id="L83" class="LineNr">83 </span>
+<span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
+<span id="L86" class="LineNr">86 </span>  trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subop subtract&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L88" class="LineNr">88 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L89" class="LineNr">89 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/update_html b/update_html
index 024b2ddb..c1a79ed0 100755
--- a/update_html
+++ b/update_html
@@ -86,5 +86,19 @@ process() {
     mv $f.out $f
   done
 
+  rm html/subx/*.html
+  for f in subx/*.cc
+  do
+    process $f
+  done
+  ( cd subx
+    ctags -x *.cc > /tmp/tags
+  )
+  linkify/linkify /tmp/tags html/subx/*.html
+  for f in html/subx/*.cc.html
+  do
+    mv $f.out $f
+  done
+
 rm /tmp/tags
 ( cd linkify; clean; )
author	Kartik K. Agaram <vc@akkartik.com>	2017-10-12 23:43:09 -0700
committer	Kartik K. Agaram <vc@akkartik.com>	2017-10-12 23:43:09 -0700
commit	25ad969f7582d9253f5329812aed5ed5784d8ec8 (patch)
tree	13ce7948b151b2583d9d372a9ce175ad25a9f836
parent	9e0ec84fb86e3173a7671ad8d4f7c2ed29613a50 (diff)
download	mu-25ad969f7582d9253f5329812aed5ed5784d8ec8.tar.gz