diff options
| -rw-r--r-- | html/subx/000organization.cc.html | 10 | ||||
| -rw-r--r-- | html/subx/001help.cc.html | 36 | ||||
| -rw-r--r-- | html/subx/002test.cc.html | 54 | ||||
| -rw-r--r-- | html/subx/003trace.cc.html | 232 | ||||
| -rw-r--r-- | html/subx/003trace.test.cc.html | 162 | ||||
| -rw-r--r-- | html/subx/010core.cc.html | 144 | ||||
| -rw-r--r-- | html/subx/011direct_addressing.cc.html | 32 | ||||
| -rw-r--r-- | html/subx/012indirect_addressing.cc.html | 30 | ||||
| -rw-r--r-- | html/subx/013immediate_addressing.cc.html | 38 | ||||
| -rw-r--r-- | linkify/linkify.cc | 8 |
10 files changed, 375 insertions, 371 deletions
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html index db32f79c..3135c257 100644 --- a/html/subx/000organization.cc.html +++ b/html/subx/000organization.cc.html @@ -171,12 +171,12 @@ if ('onhashchange' in window) { <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="L113" class="LineNr">113 </span><span class="Normal">int</span> <a href='000organization.cc.html#L113'>main</a><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><a href='000organization.cc.html#L139'>reset</a><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="L118" class="LineNr">118 </span> <a href='000organization.cc.html#L143'>assert_little_endian</a><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> @@ -197,11 +197,11 @@ if ('onhashchange' in window) { <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="L139" class="LineNr">139 </span><span class="Normal">void</span> <a href='000organization.cc.html#L139'>reset</a><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="L143" class="LineNr">143 </span><span class="Normal">void</span> <a href='000organization.cc.html#L143'>assert_little_endian</a><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><<span class="Normal">const</span> <span class="Normal">char</span>*><span class="Delimiter">(</span>&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> diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html index 73ad6bfb..2250a0c9 100644 --- a/html/subx/001help.cc.html +++ b/html/subx/001help.cc.html @@ -65,7 +65,7 @@ if ('onhashchange' in window) { <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 "End Commandline Parsing")</span> -<span id="L5" class="LineNr"> 5 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc <= <span class="Constant">1</span> || is_equal<span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"--help"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L5" class="LineNr"> 5 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc <= <span class="Constant">1</span> || <a href='001help.cc.html#L23'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"--help"</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 << <span class="Constant">"Usage:</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -83,15 +83,15 @@ if ('onhashchange' in window) { <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="L23" class="LineNr"> 23 </span><span class="Normal">bool</span> <a href='001help.cc.html#L23'>is_equal</a><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& s<span class="Delimiter">,</span> <span class="Normal">const</span> string& pat<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L27" class="LineNr"> 27 </span><span class="Normal">bool</span> <a href='001help.cc.html#L27'>starts_with</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">,</span> <span class="Normal">const</span> string& 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> && b!=pat<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++a<span class="Delimiter">,</span> ++b<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><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">()</span> && b!=pat<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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="L31" class="LineNr"> 31 </span> <span class="Identifier">return</span> b == pat<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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> @@ -157,20 +157,20 @@ if ('onhashchange' in window) { <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 "atexit(reset)")</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="L97" class="LineNr"> 97 </span><a href='001help.cc.html#L102'>initialize_signal_handlers</a><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 << INT_MAX+1 << '\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="L102" class="LineNr">102 </span><span class="Normal">void</span> <a href='001help.cc.html#L102'>initialize_signal_handlers</a><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>&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="L105" class="LineNr">105 </span> action<span class="Delimiter">.</span>sa_sigaction = <a href='001help.cc.html#L110'>dump_and_exit</a><span class="Delimiter">;</span> <span id="L106" class="LineNr">106 </span> sigemptyset<span class="Delimiter">(</span>&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> &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> &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="L110" class="LineNr">110 </span><span class="Normal">void</span> <a href='001help.cc.html#L110'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> siginfo_t* dummy1<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> <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> @@ -193,7 +193,7 @@ if ('onhashchange' in window) { <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 "atexit(reset)")</span> -<span id="L133" class="LineNr">133 </span>feenableexcept<span class="Delimiter">(</span>FE_OVERFLOW | FE_UNDERFLOW<span class="Delimiter">);</span> +<span id="L133" class="LineNr">133 </span><a href='001help.cc.html#L146'>feenableexcept</a><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 && 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> @@ -206,7 +206,7 @@ if ('onhashchange' in window) { <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="L146" class="LineNr">146 </span><span class="Normal">int</span> <a href='001help.cc.html#L146'>feenableexcept</a> <span class="Delimiter">(</span><span class="Normal">unsigned</span> <span class="Normal">int</span> excepts<span class="Delimiter">)</span> <span class="Delimiter">{</span> <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 & 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> @@ -223,22 +223,22 @@ if ('onhashchange' in window) { <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><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type& get<span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& 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="L163" class="LineNr">163 </span> assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">());</span> <span id="L164" class="LineNr">164 </span> <span class="Identifier">return</span> iter<span class="Delimiter">-></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><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>& get<span class="Delimiter">(</span><span class="Normal">const</span> T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& 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="L168" class="LineNr">168 </span> assert<span class="Delimiter">(</span>iter != map<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">());</span> <span id="L169" class="LineNr">169 </span> <span class="Identifier">return</span> iter<span class="Delimiter">-></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><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>& put<span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& key<span class="Delimiter">,</span> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>& value<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L171" class="LineNr">171 </span><span class="Normal">template</span><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>& <a href='001help.cc.html#L171'>put</a><span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& key<span class="Delimiter">,</span> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>& 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><<span class="Normal">typename</span> T> <span class="Normal">bool</span> contains_key<span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& 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="L175" class="LineNr">175 </span><span class="Normal">template</span><<span class="Normal">typename</span> T> <span class="Normal">bool</span> <a href='001help.cc.html#L175'>contains_key</a><span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& 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><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> <span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span> -<span id="L178" class="LineNr">178 </span><span class="Normal">template</span><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type& get_or_insert<span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& key<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L178" class="LineNr">178 </span><span class="Normal">template</span><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type& <a href='001help.cc.html#L178'>get_or_insert</a><span class="Delimiter">(</span>T& map<span class="Delimiter">,</span> <span class="Normal">typename</span> T::key_type <span class="Normal">const</span>& 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> @@ -248,7 +248,7 @@ if ('onhashchange' in window) { <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& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> <a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L189" class="LineNr">189 </span> <span class="Identifier">return</span> in && !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> diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html index a2a785f4..85be9d1a 100644 --- a/html/subx/002test.cc.html +++ b/html/subx/002test.cc.html @@ -74,19 +74,19 @@ if ('onhashchange' in window) { <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 "Globals")</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="L15" class="LineNr"> 15 </span><span class="Normal">const</span> <a href='002test.cc.html#L12'>test_fn</a> Tests[] = <span class="Delimiter">{</span> <span id="L16" class="LineNr"> 16 </span><span class="PreProc"> #include </span><span class="Constant">"test_list"</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 "End Globals")</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="L20" class="LineNr"> 20 </span><span class="Normal">bool</span> <a href='002test.cc.html#L20'>Run_tests</a> = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L21" class="LineNr"> 21 </span><span class="Normal">bool</span> <a href='002test.cc.html#L21'>Passed</a> = <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 "End Includes")</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 && !(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 << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): "</span><span class="PreProc"> << #X << </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="L27" class="LineNr"> 27 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </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> @@ -94,20 +94,20 @@ if ('onhashchange' in window) { <span id="L32" class="LineNr"> 32 </span><span class="PreProc"> </span><span class="Normal">if</span><span class="PreProc"> (Passed && (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 << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): "</span><span class="PreProc"> << #X << </span><span class="Constant">" == "</span><span class="PreProc"> << #Y << </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 << </span><span class="Constant">" got "</span><span class="PreProc"> << (X) << </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="L35" class="LineNr"> 35 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </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 "End Reset")</span> -<span id="L40" class="LineNr"> 40 </span>Passed = <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L40" class="LineNr"> 40 </span><a href='002test.cc.html#L21'>Passed</a> = <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 "End Commandline Parsing")</span> -<span id="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc > <span class="Constant">1</span> && is_equal<span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"test"</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="L43" class="LineNr"> 43 </span><span class="Normal">if</span> <span class="Delimiter">(</span>argc > <span class="Constant">1</span> && <a href='001help.cc.html#L23'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"test"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L44" class="LineNr"> 44 </span> <a href='002test.cc.html#L20'>Run_tests</a> = <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 "End Main")</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="L48" class="LineNr"> 48 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L20'>Run_tests</a><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> @@ -115,10 +115,10 @@ if ('onhashchange' in window) { <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>&t<span class="Delimiter">);</span> <span id="L55" class="LineNr"> 55 </span> cerr << <span class="Constant">"C tests: "</span> << ctime<span class="Delimiter">(</span>&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 < <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="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> <a href='010core.cc.html#L16'>i</a> < <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='002test.cc.html#L15'>Tests</a><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 << "running .build/test_list line " << (i+1) << '\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 << <span class="Constant">'.'</span><span class="Delimiter">;</span> +<span id="L58" class="LineNr"> 58 </span> <span class="Conceal">¦</span> <a href='002test.cc.html#L74'>run_test</a><span class="Delimiter">(</span><a href='010core.cc.html#L16'>i</a><span class="Delimiter">);</span> +<span id="L59" class="LineNr"> 59 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a><span class="Delimiter">)</span> cerr << <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 << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> @@ -133,25 +133,25 @@ if ('onhashchange' in window) { <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 >= <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 << <span class="Constant">"no test "</span> << i << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> <a href='002test.cc.html#L74'>run_test</a><span class="Delimiter">(</span><span class="Normal">size_t</span> <a href='010core.cc.html#L16'>i</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L75" class="LineNr"> 75 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010core.cc.html#L16'>i</a> >= <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='002test.cc.html#L15'>Tests</a><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 << <span class="Constant">"no test "</span> << <a href='010core.cc.html#L16'>i</a> << <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="L79" class="LineNr"> 79 </span> <a href='000organization.cc.html#L139'>reset</a><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& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L85" class="LineNr"> 85 </span><span class="Normal">bool</span> <a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span><span class="Normal">const</span> string& 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">"0123456789-"</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> && s<span class="Delimiter">.</span>find_first_of<span class="Delimiter">(</span><span class="Constant">"0123456789"</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> && 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="L91" class="LineNr"> 91 </span><span class="Normal">int</span> <a href='002test.cc.html#L91'>to_integer</a><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>* <a href='003trace.cc.html#L184'>end</a> = <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> &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 << <span class="Constant">"tried to convert "</span> << n << <span class="Constant">" to number</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> @@ -159,14 +159,14 @@ if ('onhashchange' in window) { <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">"1234"</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">"-1"</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">"234.0"</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">"-567"</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">"89-0"</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">"-"</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">"1e3"</span><span class="Delimiter">));</span> <span class="Comment">// not supported</span> +<span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='002test.cc.html#L100'>test_is_integer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L101" class="LineNr">101 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span><span class="Constant">"1234"</span><span class="Delimiter">));</span> +<span id="L102" class="LineNr">102 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span><span class="Constant">"-1"</span><span class="Delimiter">));</span> +<span id="L103" class="LineNr">103 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">"234.0"</span><span class="Delimiter">));</span> +<span id="L104" class="LineNr">104 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span><a href='002test.cc.html#L85'>is_integer</a><span class="Delimiter">(</span><span class="Constant">"-567"</span><span class="Delimiter">));</span> +<span id="L105" class="LineNr">105 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">"89-0"</span><span class="Delimiter">));</span> +<span id="L106" class="LineNr">106 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">"-"</span><span class="Delimiter">));</span> +<span id="L107" class="LineNr">107 </span> <a href='002test.cc.html#L24'>CHECK</a><span class="Delimiter">(</span>!is_integer<span class="Delimiter">(</span><span class="Constant">"1e3"</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 "End Includes")</span> diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html index 9fca7be6..81d543b6 100644 --- a/html/subx/003trace.cc.html +++ b/html/subx/003trace.cc.html @@ -130,89 +130,89 @@ if ('onhashchange' in window) { <span id="L69" class="LineNr"> 69 </span> <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">:(before "End Types")</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="L72" class="LineNr"> 72 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span> <span class="Comment">// optional field just to help browse traces later</span> +<span id="L73" class="LineNr"> 73 </span> string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span> +<span id="L74" class="LineNr"> 74 </span> string <a href='003trace.cc.html#L74'>contents</a><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> :<a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">(</span>l<span class="Delimiter">),</span> <a href='003trace.cc.html#L74'>contents</a><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> :<a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">(</span>d<span class="Delimiter">),</span> <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">(</span>l<span class="Delimiter">),</span> <a href='003trace.cc.html#L74'>contents</a><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 "End Globals")</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">""</span><span class="Delimiter">;</span> +<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L81'>Dump_trace</a> = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L82" class="LineNr"> 82 </span>string <a href='003trace.cc.html#L82'>Dump_label</a> = <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before "End Reset")</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">""</span><span class="Delimiter">;</span> +<span id="L85" class="LineNr"> 85 </span><a href='003trace.cc.html#L81'>Dump_trace</a> = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L86" class="LineNr"> 86 </span><a href='003trace.cc.html#L82'>Dump_label</a> = <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L87" class="LineNr"> 87 </span> <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before "End Types")</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="L92" class="LineNr"> 92 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L92'>Max_depth</a> = <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> <a href='003trace.cc.html#L93'>Error_depth</a> = <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<trace_line> past_lines<span class="Delimiter">;</span> +<span id="L96" class="LineNr"> 96 </span> vector<trace_line> <a href='003trace.cc.html#L96'>past_lines</a><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="L98" class="LineNr"> 98 </span> ostringstream* <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> +<span id="L99" class="LineNr"> 99 </span> string <a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">;</span> +<span id="L100" class="LineNr">100 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">;</span> +<span id="L101" class="LineNr">101 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L101'>callstack_depth</a><span class="Delimiter">;</span> +<span id="L102" class="LineNr">102 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">;</span> +<span id="L103" class="LineNr">103 </span> ofstream <a href='003trace.cc.html#L103'>null_stream</a><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> :<a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L101'>callstack_depth</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">)</span> <span class="Delimiter">{}</span> +<span id="L105" class="LineNr">105 </span> <a href='003trace.cc.html#L105'>~trace_stream</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span id="L106" class="LineNr">106 </span> -<span id="L107" class="LineNr">107 </span> ostream& 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="L107" class="LineNr">107 </span> ostream& stream<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L92'>Max_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L73'>label</a><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& 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 > 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="L111" class="LineNr">111 </span> ostream& stream<span class="Delimiter">(</span><span class="Normal">int</span> <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">,</span> string <a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L72'>depth</a> > <a href='003trace.cc.html#L102'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span> <a href='003trace.cc.html#L103'>null_stream</a><span class="Delimiter">;</span> +<span id="L113" class="LineNr">113 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span> +<span id="L114" class="LineNr">114 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L99'>curr_label</a> = <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">;</span> +<span id="L115" class="LineNr">115 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L100'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><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="L120" class="LineNr">120 </span> <span class="Normal">void</span> <a href='003trace.cc.html#L126'>newline</a><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="L122" class="LineNr">122 </span> string <a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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="L126" class="LineNr">126 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L126'>newline</a><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">-></span>str<span class="Delimiter">();</span> +<span id="L128" class="LineNr">128 </span> string curr_contents = <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">-></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 && curr_label == <span class="Constant">"error"</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> && curr_label == Dump_label<span class="Delimiter">))</span> -<span id="L134" class="LineNr">134 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << curr_label << <span class="Constant">": "</span> << curr_contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L130" class="LineNr">130 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L100'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L99'>curr_label</a><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 && <a href='003trace.cc.html#L99'>curr_label</a> == <span class="Constant">"error"</span><span class="Delimiter">)</span> +<span id="L132" class="LineNr">132 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> || <a href='003trace.cc.html#L81'>Dump_trace</a> +<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> && <a href='003trace.cc.html#L99'>curr_label</a> == <a href='003trace.cc.html#L82'>Dump_label</a><span class="Delimiter">))</span> +<span id="L134" class="LineNr">134 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << <a href='003trace.cc.html#L99'>curr_label</a> << <span class="Constant">": "</span> << curr_contents << <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="L136" class="LineNr">136 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L98'>curr_stream</a><span class="Delimiter">;</span> +<span id="L137" class="LineNr">137 </span> <a href='003trace.cc.html#L98'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L138" class="LineNr">138 </span> <a href='003trace.cc.html#L99'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L139" class="LineNr">139 </span> <a href='003trace.cc.html#L100'>curr_depth</a> = <a href='003trace.cc.html#L92'>Max_depth</a><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="L142" class="LineNr">142 </span>string trace_stream::<a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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<trace_line>::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">-></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 << std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> << p<span class="Delimiter">-></span>depth << <span class="Constant">' '</span> << p<span class="Delimiter">-></span>label << <span class="Constant">": "</span> << p<span class="Delimiter">-></span>contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L144" class="LineNr">144 </span> <a href='003trace.cc.html#L73'>label</a> = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">);</span> +<span id="L145" class="LineNr">145 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L147" class="LineNr">147 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> output << std::setw<span class="Delimiter">(</span><span class="Constant">4</span><span class="Delimiter">)</span> << p<span class="Delimiter">-></span><a href='003trace.cc.html#L72'>depth</a> << <span class="Constant">' '</span> << p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a> << <span class="Constant">": "</span> << p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a> << <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 "End Globals")</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="L153" class="LineNr">153 </span>trace_stream* <a href='003trace.cc.html#L153'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L154" class="LineNr">154 </span><span class="Normal">int</span> <a href='003trace.cc.html#L154'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// used only when Trace_stream is NULL</span> <span id="L155" class="LineNr">155 </span> <span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before "End Includes")</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> @@ -233,46 +233,46 @@ if ('onhashchange' in window) { <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 "End Test Teardown")</span> -<span id="L175" class="LineNr">175 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Passed && !Hide_errors && 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="L175" class="LineNr">175 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && !Hide_errors && <a href='003trace.cc.html#L179'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L176" class="LineNr">176 </span> <a href='002test.cc.html#L21'>Passed</a> = <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 > <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">)</span> > <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L179'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L180" class="LineNr">180 </span> <span class="Identifier">return</span> <a href='003trace.cc.html#L154'>Trace_errors</a> > <span class="Constant">0</span> || trace_count<span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">)</span> > <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 "End Types")</span> -<span id="L184" class="LineNr">184 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span> +<span id="L184" class="LineNr">184 </span><span class="Normal">struct</span> <a href='003trace.cc.html#L184'>end</a> <span class="Delimiter">{};</span> <span id="L185" class="LineNr">185 </span><span class="Delimiter">:(code)</span> -<span id="L186" class="LineNr">186 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& 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">-></span>newline<span class="Delimiter">();</span> +<span id="L186" class="LineNr">186 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> <a href='001help.cc.html#L208'>unused</a> <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L187" class="LineNr">187 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L126'>newline</a><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 "End Globals")</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="L192" class="LineNr">192 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L192'>Save_trace</a> = <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 "End Types")</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="L198" class="LineNr">198 </span> <a href='003trace.cc.html#L202'>~lease_tracer</a><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="L201" class="LineNr">201 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L153'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span> +<span id="L202" class="LineNr">202 </span>lease_tracer::<a href='003trace.cc.html#L202'>~lease_tracer</a><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="L204" class="LineNr">204 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L192'>Save_trace</a><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">"last_trace"</span><span class="Delimiter">);</span> -<span id="L206" class="LineNr">206 </span> <span class="Conceal">¦</span> fout << Trace_stream<span class="Delimiter">-></span>readable_contents<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L206" class="LineNr">206 </span> <span class="Conceal">¦</span> fout << <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L142'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">""</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="L209" class="LineNr">209 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L153'>Trace_stream</a> = <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 "End Includes")</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 "End Test Setup")</span> -<span id="L214" class="LineNr">214 </span>START_TRACING_UNTIL_END_OF_SCOPE +<span id="L214" class="LineNr">214 </span><a href='003trace.cc.html#L212'>START_TRACING_UNTIL_END_OF_SCOPE</a> <span id="L215" class="LineNr">215 </span> <span id="L216" class="LineNr">216 </span><span class="Delimiter">:(before "End Includes")</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> @@ -282,143 +282,143 @@ if ('onhashchange' in window) { <span id="L221" class="LineNr">221 </span><span class="PreProc"> </span><span class="Normal">if</span><span class="PreProc"> (Passed && 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 << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">"</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">"error"</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="L224" class="LineNr">224 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </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 && 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 << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): trace_count of "</span><span class="PreProc"> << label << </span><span class="Constant">" should be "</span><span class="PreProc"> << count << </span><span class="cSpecial">'\n'</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 << </span><span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span><span class="PreProc"> << __FUNCTION__ << </span><span class="Constant">"("</span><span class="PreProc"> << </span><span class="Constant">__FILE__</span><span class="PreProc"> << </span><span class="Constant">":"</span><span class="PreProc"> << </span><span class="Constant">__LINE__</span><span class="PreProc"> << </span><span class="Constant">"): trace_count of "</span><span class="PreProc"> << <a href='003trace.cc.html#L73'>label</a> << </span><span class="Constant">" should be "</span><span class="PreProc"> << count << </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 << </span><span class="Constant">" got "</span><span class="PreProc"> << trace_count(label) << </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="L233" class="LineNr">233 </span><span class="PreProc"> </span><span class="Conceal">¦</span><span class="PreProc"> <a href='002test.cc.html#L21'>Passed</a> = </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="L240" class="LineNr">240 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L240'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="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<string> expected_lines = split<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">"^D"</span><span class="Delimiter">);</span> +<span id="L243" class="LineNr">243 </span> vector<string> expected_lines = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">"^D"</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 < SIZE<span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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="L245" class="LineNr">245 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < <a href='001help.cc.html#L91'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> -<span id="L250" class="LineNr">250 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></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">-></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">-></span>contents<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L247" class="LineNr">247 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L91'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L248" class="LineNr">248 </span> string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span> +<span id="L249" class="LineNr">249 </span> <a href='003trace.cc.html#L272'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> +<span id="L250" class="LineNr">250 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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><a href='003trace.cc.html#L73'>label</a> != p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><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 < SIZE<span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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="L254" class="LineNr">254 </span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < <a href='001help.cc.html#L91'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && 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> &label<span class="Delimiter">,</span> &contents<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 == <a href='001help.cc.html#L91'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L257" class="LineNr">257 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L272'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &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 << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): line ["</span> << label << <span class="Constant">": "</span> << contents << <span class="Constant">"] out of order in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L262" class="LineNr">262 </span> <span class="Conceal">¦</span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L260" class="LineNr">260 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L285'>line_exists_anywhere</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L261" class="LineNr">261 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): line ["</span> << <a href='003trace.cc.html#L73'>label</a> << <span class="Constant">": "</span> << <a href='003trace.cc.html#L74'>contents</a> << <span class="Constant">"] out of order in <a href='003trace.cc.html#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L262" class="LineNr">262 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L263" class="LineNr">263 </span> <span class="Delimiter">}</span> <span id="L264" class="LineNr">264 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L265" class="LineNr">265 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): missing ["</span> << contents << <span class="Constant">"] in trace:</span><span class="cSpecial">\n</span><span class="Constant">"</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="L265" class="LineNr">265 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << FUNCTION << <span class="Constant">"("</span> << <span class="Normal">FILE</span> << <span class="Constant">":"</span> << LINE << <span class="Constant">"): missing ["</span> << <a href='003trace.cc.html#L74'>contents</a> << <span class="Constant">"] in <a href='003trace.cc.html#L160'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L266" class="LineNr">266 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L164'>DUMP</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><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="L268" class="LineNr">268 </span> <a href='002test.cc.html#L21'>Passed</a> = <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& s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* contents<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L272" class="LineNr">272 </span><span class="Normal">void</span> <a href='003trace.cc.html#L272'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string* <a href='003trace.cc.html#L74'>contents</a><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">": "</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">""</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="L277" class="LineNr">277 </span> <span class="Conceal">¦</span> *contents = <a href='003trace.cc.html#L354'>trim</a><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="L280" class="LineNr">280 </span> <span class="Conceal">¦</span> *label = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span> +<span id="L281" class="LineNr">281 </span> <span class="Conceal">¦</span> *contents = <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span> <span id="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& label<span class="Delimiter">,</span> <span class="Normal">const</span> string& 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<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></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">-></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">-></span>contents<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L285" class="LineNr">285 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L285'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string& <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <span class="Normal">const</span> string& <a href='003trace.cc.html#L74'>contents</a><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<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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><a href='003trace.cc.html#L73'>label</a> != p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> <span id="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">""</span><span class="Delimiter">);</span> +<span id="L293" class="LineNr">293 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <span class="Constant">""</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="L297" class="LineNr">297 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></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">-></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">""</span> || trim<span class="Delimiter">(</span>line<span class="Delimiter">)</span> == trim<span class="Delimiter">(</span>p<span class="Delimiter">-></span>contents<span class="Delimiter">))</span> +<span id="L300" class="LineNr">300 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><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">""</span> || <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>line<span class="Delimiter">)</span> == <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><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="L309" class="LineNr">309 </span><span class="Normal">int</span> <a href='003trace.cc.html#L309'>trace_count_prefix</a><span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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<trace_line>::iterator p = Trace_stream<span class="Delimiter">-></span>past_lines<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Trace_stream<span class="Delimiter">-></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">-></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">-></span>contents<span class="Delimiter">),</span> trim<span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span> +<span id="L312" class="LineNr">312 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L153'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L96'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-></span><a href='003trace.cc.html#L73'>label</a><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><a href='001help.cc.html#L27'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L354'>trim</a><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="L321" class="LineNr">321 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><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><a href='003trace.cc.html#L73'>label</a><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<string> tmp = split_first<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">": "</span><span class="Delimiter">);</span> +<span id="L326" class="LineNr">326 </span> vector<string> tmp = <a href='003trace.cc.html#L345'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">": "</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<string> split<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L330" class="LineNr">330 </span>vector<string> <a href='003trace.cc.html#L330'>split</a><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<string> 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="L334" class="LineNr">334 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> == 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="L340" class="LineNr">340 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L184'>end</a> = 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<string> split_first<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L345" class="LineNr">345 </span>vector<string> <a href='003trace.cc.html#L345'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L346" class="LineNr">346 </span> vector<string> 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="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> <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">));</span> +<span id="L349" class="LineNr">349 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L184'>end</a> != 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& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L354" class="LineNr">354 </span>string <a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string& 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> && isspace<span class="Delimiter">(</span>*first<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><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">()</span> && 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">""</span><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><a href='003trace.cc.html#L184'>end</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">""</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="L360" class="LineNr">360 </span> string::const_iterator last = --s<span class="Delimiter">.</span><a href='003trace.cc.html#L184'>end</a><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> && 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> @@ -450,8 +450,8 @@ if ('onhashchange' in window) { <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="L392" class="LineNr">392 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L392'>Initial_callstack_depth</a> = <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> <a href='003trace.cc.html#L393'>Max_callstack_depth</a> = <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> diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html index 1ec0e1a7..621dab4d 100644 --- a/html/subx/003trace.test.cc.html +++ b/html/subx/003trace.test.cc.html @@ -56,68 +56,68 @@ if ('onhashchange' in window) { </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">"test layer"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L3" class="LineNr"> 3 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer: foo"</span><span class="Delimiter">);</span> +<span id="L1" class="LineNr"> 1 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L1'>test_trace_check_compares</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L2" class="LineNr"> 2 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L3" class="LineNr"> 3 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer: foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L8" class="LineNr"> 8 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 2"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << end<span class="Delimiter">();</span> -<span id="L9" class="LineNr"> 9 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</span><span class="Delimiter">);</span> -<span id="L10" class="LineNr"> 10 </span> CHECK_TRACE_DOESNT_CONTAIN<span class="Delimiter">(</span><span class="Constant">"test layer 2: foo"</span><span class="Delimiter">);</span> +<span id="L6" class="LineNr"> 6 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L6'>test_trace_check_ignores_other_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L7" class="LineNr"> 7 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L8" class="LineNr"> 8 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 2"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L9" class="LineNr"> 9 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</span><span class="Delimiter">);</span> +<span id="L10" class="LineNr"> 10 </span> <a href='003trace.cc.html#L237'>CHECK_TRACE_DOESNT_CONTAIN</a><span class="Delimiter">(</span><span class="Constant">"test layer 2: foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">" foo"</span> << 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">"test layer 1"</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too little whitespace</span><span class="Comment">*/</span><span class="Constant">"foo"</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">"test layer 1"</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too much whitespace</span><span class="Comment">*/</span><span class="Constant">" foo"</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L13" class="LineNr"> 13 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L13'>test_trace_check_ignores_leading_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L14" class="LineNr"> 14 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">" foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L15" class="LineNr"> 15 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too little whitespace</span><span class="Comment">*/</span><span class="Constant">"foo"</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L16" class="LineNr"> 16 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">too much whitespace</span><span class="Comment">*/</span><span class="Constant">" foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L21" class="LineNr"> 21 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << end<span class="Delimiter">();</span> -<span id="L22" class="LineNr"> 22 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</span><span class="Delimiter">);</span> +<span id="L19" class="LineNr"> 19 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L19'>test_trace_check_ignores_other_lines</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L20" class="LineNr"> 20 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L21" class="LineNr"> 21 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L22" class="LineNr"> 22 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L27" class="LineNr"> 27 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << end<span class="Delimiter">();</span> -<span id="L28" class="LineNr"> 28 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer 1: bar"</span><span class="Delimiter">);</span> +<span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L25'>test_trace_check_ignores_other_lines2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L26" class="LineNr"> 26 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L27" class="LineNr"> 27 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L28" class="LineNr"> 28 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer 1: bar"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L33" class="LineNr"> 33 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</span><span class="Delimiter">);</span> +<span id="L31" class="LineNr"> 31 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L31'>test_trace_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L32" class="LineNr"> 32 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L33" class="LineNr"> 33 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo "</span> << end<span class="Delimiter">();</span> -<span id="L38" class="LineNr"> 38 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</span><span class="Delimiter">);</span> +<span id="L36" class="LineNr"> 36 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L36'>test_trace_ignores_trailing_whitespace2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L37" class="LineNr"> 37 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo "</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L38" class="LineNr"> 38 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer 1: foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L43" class="LineNr"> 43 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 2"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << end<span class="Delimiter">();</span> -<span id="L44" class="LineNr"> 44 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"qux"</span> << end<span class="Delimiter">();</span> -<span id="L45" class="LineNr"> 45 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span><span class="Constant">"test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D"</span><span class="Delimiter">);</span> +<span id="L41" class="LineNr"> 41 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L41'>test_trace_orders_across_layers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L42" class="LineNr"> 42 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L43" class="LineNr"> 43 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 2"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L44" class="LineNr"> 44 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"qux"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L45" class="LineNr"> 45 </span> <a href='003trace.cc.html#L217'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"test layer 1: foo^Dtest layer 2: bar^Dtest layer 1: qux^D"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L50" class="LineNr"> 50 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << 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">"test layer 1"</span><span class="Delimiter">,</span> <span class="Constant">"foo"</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L48" class="LineNr"> 48 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L48'>test_trace_supports_count</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L49" class="LineNr"> 49 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L50" class="LineNr"> 50 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L51" class="LineNr"> 51 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">,</span> <span class="Constant">"foo"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << end<span class="Delimiter">();</span> -<span id="L56" class="LineNr"> 56 </span> trace<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << 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">"test layer 1"</span><span class="Delimiter">),</span> <span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L54" class="LineNr"> 54 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L54'>test_trace_supports_count2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L55" class="LineNr"> 55 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L56" class="LineNr"> 56 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"bar"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L57" class="LineNr"> 57 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"test layer 1"</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">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo</span><span class="cSpecial">\n</span><span class="Constant">"</span> << 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">"test layer 1"</span><span class="Delimiter">,</span> <span class="Constant">"foo"</span><span class="Delimiter">),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L60'>test_trace_count_ignores_trailing_whitespace</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L61" class="LineNr"> 61 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">)</span> << <span class="Constant">"foo</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L62" class="LineNr"> 62 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"test layer 1"</span><span class="Delimiter">,</span> <span class="Constant">"foo"</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> @@ -130,55 +130,55 @@ if ('onhashchange' in window) { <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<string> result = split<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">,</span> <span class="Constant">","</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">""</span><span class="Delimiter">);</span> +<span id="L75" class="LineNr"> 75 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L75'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L76" class="LineNr"> 76 </span> vector<string> result = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">,</span> <span class="Constant">","</span><span class="Delimiter">);</span> +<span id="L77" class="LineNr"> 77 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L78" class="LineNr"> 78 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">""</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<string> result = split<span class="Delimiter">(</span><span class="Constant">"abc"</span><span class="Delimiter">,</span> <span class="Constant">","</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">"abc"</span><span class="Delimiter">);</span> +<span id="L81" class="LineNr"> 81 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L81'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L82" class="LineNr"> 82 </span> vector<string> result = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span><span class="Constant">"abc"</span><span class="Delimiter">,</span> <span class="Constant">","</span><span class="Delimiter">);</span> +<span id="L83" class="LineNr"> 83 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L84" class="LineNr"> 84 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</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<string> result = split<span class="Delimiter">(</span><span class="Constant">"abc,def"</span><span class="Delimiter">,</span> <span class="Constant">","</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">"abc"</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">"def"</span><span class="Delimiter">);</span> +<span id="L87" class="LineNr"> 87 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L87'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L88" class="LineNr"> 88 </span> vector<string> result = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span><span class="Constant">"abc,def"</span><span class="Delimiter">,</span> <span class="Constant">","</span><span class="Delimiter">);</span> +<span id="L89" class="LineNr"> 89 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L90" class="LineNr"> 90 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> +<span id="L91" class="LineNr"> 91 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">"def"</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<string> result = split<span class="Delimiter">(</span><span class="Constant">"abc,def,ghi"</span><span class="Delimiter">,</span> <span class="Constant">","</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">"abc"</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">"def"</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">"ghi"</span><span class="Delimiter">);</span> +<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L94'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L95" class="LineNr"> 95 </span> vector<string> result = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span><span class="Constant">"abc,def,ghi"</span><span class="Delimiter">,</span> <span class="Constant">","</span><span class="Delimiter">);</span> +<span id="L96" class="LineNr"> 96 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L97" class="LineNr"> 97 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> +<span id="L98" class="LineNr"> 98 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">"def"</span><span class="Delimiter">);</span> +<span id="L99" class="LineNr"> 99 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">"ghi"</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<string> result = split<span class="Delimiter">(</span><span class="Constant">"abc,,def,,ghi"</span><span class="Delimiter">,</span> <span class="Constant">",,"</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">"abc"</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">"def"</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">"ghi"</span><span class="Delimiter">);</span> +<span id="L102" class="LineNr">102 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L102'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L103" class="LineNr">103 </span> vector<string> result = <a href='003trace.cc.html#L330'>split</a><span class="Delimiter">(</span><span class="Constant">"abc,,def,,ghi"</span><span class="Delimiter">,</span> <span class="Constant">",,"</span><span class="Delimiter">);</span> +<span id="L104" class="LineNr">104 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L105" class="LineNr">105 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> +<span id="L106" class="LineNr">106 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">"def"</span><span class="Delimiter">);</span> +<span id="L107" class="LineNr">107 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">"ghi"</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">""</span><span class="Delimiter">),</span> <span class="Constant">""</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">" "</span><span class="Delimiter">),</span> <span class="Constant">""</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">" "</span><span class="Delimiter">),</span> <span class="Constant">""</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">"a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">" a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">" a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">" ab"</span><span class="Delimiter">),</span> <span class="Constant">"ab"</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">"a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">"a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">"ab "</span><span class="Delimiter">),</span> <span class="Constant">"ab"</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">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">" ab "</span><span class="Delimiter">),</span> <span class="Constant">"ab"</span><span class="Delimiter">);</span> +<span id="L110" class="LineNr">110 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L110'>test_trim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L111" class="LineNr">111 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">),</span> <span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L112" class="LineNr">112 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" "</span><span class="Delimiter">),</span> <span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L113" class="LineNr">113 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" "</span><span class="Delimiter">),</span> <span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L114" class="LineNr">114 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">"a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L115" class="LineNr">115 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L116" class="LineNr">116 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L117" class="LineNr">117 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" ab"</span><span class="Delimiter">),</span> <span class="Constant">"ab"</span><span class="Delimiter">);</span> +<span id="L118" class="LineNr">118 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">"a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L119" class="LineNr">119 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">"a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L120" class="LineNr">120 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">"ab "</span><span class="Delimiter">),</span> <span class="Constant">"ab"</span><span class="Delimiter">);</span> +<span id="L121" class="LineNr">121 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L122" class="LineNr">122 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L123" class="LineNr">123 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L354'>trim</a><span class="Delimiter">(</span><span class="Constant">" ab "</span><span class="Delimiter">),</span> <span class="Constant">"ab"</span><span class="Delimiter">);</span> <span id="L124" class="LineNr">124 </span><span class="Delimiter">}</span> </pre> </body> diff --git a/html/subx/010core.cc.html b/html/subx/010core.cc.html index 8d7cb3a2..f6772607 100644 --- a/html/subx/010core.cc.html +++ b/html/subx/010core.cc.html @@ -65,35 +65,35 @@ if ('onhashchange' in window) { <span id="L2" class="LineNr"> 2 </span> <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before "End Types")</span> <span id="L4" class="LineNr"> 4 </span><span class="Normal">enum</span> <span class="Delimiter">{</span> -<span id="L5" class="LineNr"> 5 </span> EAX<span class="Delimiter">,</span> -<span id="L6" class="LineNr"> 6 </span> ECX<span class="Delimiter">,</span> -<span id="L7" class="LineNr"> 7 </span> EDX<span class="Delimiter">,</span> -<span id="L8" class="LineNr"> 8 </span> EBX<span class="Delimiter">,</span> -<span id="L9" class="LineNr"> 9 </span> ESP<span class="Delimiter">,</span> -<span id="L10" class="LineNr"> 10 </span> EBP<span class="Delimiter">,</span> -<span id="L11" class="LineNr"> 11 </span> ESI<span class="Delimiter">,</span> -<span id="L12" class="LineNr"> 12 </span> EDI<span class="Delimiter">,</span> -<span id="L13" class="LineNr"> 13 </span> NUM_INT_REGISTERS<span class="Delimiter">,</span> +<span id="L5" class="LineNr"> 5 </span> <a href='010core.cc.html#L5'>EAX</a><span class="Delimiter">,</span> +<span id="L6" class="LineNr"> 6 </span> <a href='010core.cc.html#L6'>ECX</a><span class="Delimiter">,</span> +<span id="L7" class="LineNr"> 7 </span> <a href='010core.cc.html#L7'>EDX</a><span class="Delimiter">,</span> +<span id="L8" class="LineNr"> 8 </span> <a href='010core.cc.html#L8'>EBX</a><span class="Delimiter">,</span> +<span id="L9" class="LineNr"> 9 </span> <a href='010core.cc.html#L9'>ESP</a><span class="Delimiter">,</span> +<span id="L10" class="LineNr"> 10 </span> <a href='010core.cc.html#L10'>EBP</a><span class="Delimiter">,</span> +<span id="L11" class="LineNr"> 11 </span> <a href='010core.cc.html#L11'>ESI</a><span class="Delimiter">,</span> +<span id="L12" class="LineNr"> 12 </span> <a href='010core.cc.html#L12'>EDI</a><span class="Delimiter">,</span> +<span id="L13" class="LineNr"> 13 </span> <a href='010core.cc.html#L13'>NUM_INT_REGISTERS</a><span class="Delimiter">,</span> <span id="L14" class="LineNr"> 14 </span><span class="Delimiter">};</span> -<span id="L15" class="LineNr"> 15 </span><span class="Normal">union</span> reg <span class="Delimiter">{</span> -<span id="L16" class="LineNr"> 16 </span> <span class="Normal">int32_t</span> i<span class="Delimiter">;</span> -<span id="L17" class="LineNr"> 17 </span> <span class="Normal">uint32_t</span> u<span class="Delimiter">;</span> +<span id="L15" class="LineNr"> 15 </span><span class="Normal">union</span> <a href='010core.cc.html#L15'>reg</a> <span class="Delimiter">{</span> +<span id="L16" class="LineNr"> 16 </span> <span class="Normal">int32_t</span> <a href='010core.cc.html#L16'>i</a><span class="Delimiter">;</span> +<span id="L17" class="LineNr"> 17 </span> <span class="Normal">uint32_t</span> <a href='010core.cc.html#L17'>u</a><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 "End Globals")</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="L20" class="LineNr"> 20 </span><a href='010core.cc.html#L15'>reg</a> Reg[NUM_INT_REGISTERS] = <span class="Delimiter">{</span> <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">}</span> <span class="Delimiter">};</span> +<span id="L21" class="LineNr"> 21 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L21'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before "End Reset")</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="L23" class="LineNr"> 23 </span>bzero<span class="Delimiter">(</span><a href='010core.cc.html#L20'>Reg</a><span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='010core.cc.html#L20'>Reg</a><span class="Delimiter">));</span> +<span id="L24" class="LineNr"> 24 </span><a href='010core.cc.html#L21'>EIP</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L25" class="LineNr"> 25 </span> <span id="L26" class="LineNr"> 26 </span><span class="SalientComment">//:: simulated flag registers; just a subset that we care about</span> <span id="L27" class="LineNr"> 27 </span> <span id="L28" class="LineNr"> 28 </span><span class="Delimiter">:(before "End Globals")</span> <span id="L29" class="LineNr"> 29 </span><span class="Normal">bool</span> SF = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">// sign flag</span> -<span id="L30" class="LineNr"> 30 </span><span class="Normal">bool</span> ZF = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">// zero flag</span> -<span id="L31" class="LineNr"> 31 </span><span class="Normal">bool</span> OF = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">// overflow flag</span> +<span id="L30" class="LineNr"> 30 </span><span class="Normal">bool</span> <a href='010core.cc.html#L30'>ZF</a> = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">// zero flag</span> +<span id="L31" class="LineNr"> 31 </span><span class="Normal">bool</span> <a href='010core.cc.html#L31'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span> <span class="Comment">// overflow flag</span> <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L33" class="LineNr"> 33 </span>SF = ZF = OF = <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L33" class="LineNr"> 33 </span>SF = <a href='010core.cc.html#L30'>ZF</a> = <a href='010core.cc.html#L31'>OF</a> = <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L34" class="LineNr"> 34 </span> <span id="L35" class="LineNr"> 35 </span><span class="Comment">//: how the flag registers are updated after each instruction</span> <span id="L36" class="LineNr"> 36 </span> @@ -103,30 +103,30 @@ 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"> trace(</span><span class="Constant">2</span><span class="Delimiter">,</span><span class="PreProc"> </span><span class="Constant">"run"</span><span class="PreProc">) << </span><span class="Constant">"storing 0x"</span><span class="PreProc"> << HEXWORD << arg1 << end()</span><span class="Delimiter">;</span><span class="PreProc"> \</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">"run"</span><span class="PreProc">) << </span><span class="Constant">"storing 0x"</span><span class="PreProc"> << <a href='010core.cc.html#L218'>HEXWORD</a> << arg1 << end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span> <span id="L44" class="LineNr"> 44 </span><span class="PreProc"> SF = (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"> 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="L45" class="LineNr"> 45 </span><span class="PreProc"> <a href='010core.cc.html#L30'>ZF</a> = (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"> <a href='010core.cc.html#L31'>OF</a> = (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">"run"</span><span class="PreProc">) << </span><span class="Constant">"storing 0x"</span><span class="PreProc"> << HEXWORD << arg1 << end()</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">"run"</span><span class="PreProc">) << </span><span class="Constant">"storing 0x"</span><span class="PreProc"> << <a href='010core.cc.html#L218'>HEXWORD</a> << arg1 << end()</span><span class="Delimiter">;</span><span class="PreProc"> \</span> <span id="L53" class="LineNr"> 53 </span><span class="PreProc"> SF = (arg1 >> </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="L54" class="LineNr"> 54 </span><span class="PreProc"> <a href='010core.cc.html#L30'>ZF</a> = (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"> <a href='010core.cc.html#L31'>OF</a> = </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="SalientComment">//:: simulated RAM</span> <span id="L59" class="LineNr"> 59 </span> <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L61" class="LineNr"> 61 </span>vector<<span class="Normal">uint8_t</span>> 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="L61" class="LineNr"> 61 </span>vector<<span class="Normal">uint8_t</span>> <a href='010core.cc.html#L61'>Mem</a><span class="Delimiter">;</span> +<span id="L62" class="LineNr"> 62 </span><span class="Normal">uint32_t</span> <a href='010core.cc.html#L62'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L63" class="LineNr"> 63 </span><span class="Delimiter">:(before "End Reset")</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="L64" class="LineNr"> 64 </span><a href='010core.cc.html#L61'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L65" class="LineNr"> 65 </span><a href='010core.cc.html#L61'>Mem</a><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><a href='010core.cc.html#L62'>End_of_program</a> = <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> @@ -145,94 +145,94 @@ if ('onhashchange' in window) { <span id="L82" class="LineNr"> 82 </span><span class="traceContains">+load: 3 -> 0b</span> <span id="L83" class="LineNr"> 83 </span><span class="traceContains">+load: 4 -> 0c</span> <span id="L84" class="LineNr"> 84 </span><span class="traceContains">+load: 5 -> 0d</span> -<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to reg EAX</span> +<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: add <a href='010core.cc.html#L207'>imm32</a> 0x0d0c0b0a to <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></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& 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 < 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="L91" class="LineNr"> 91 </span><span class="Normal">void</span> <a href='010core.cc.html#L91'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L92" class="LineNr"> 92 </span> <a href='010core.cc.html#L143'>load_program</a><span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span> +<span id="L93" class="LineNr"> 93 </span> <a href='010core.cc.html#L21'>EIP</a> = <span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// preserve null pointer</span> +<span id="L94" class="LineNr"> 94 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010core.cc.html#L21'>EIP</a> < <a href='010core.cc.html#L62'>End_of_program</a><span class="Delimiter">)</span> +<span id="L95" class="LineNr"> 95 </span> <span class="Conceal">¦</span> <a href='010core.cc.html#L99'>run_one_instruction</a><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="L99" class="LineNr"> 99 </span><span class="Normal">void</span> <a href='010core.cc.html#L99'>run_one_instruction</a><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="L101" class="LineNr">101 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>op = <a href='010core.cc.html#L202'>next</a><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="L103" class="LineNr">103 </span> <span class="Conceal">¦</span> <a href='010core.cc.html#L21'>EIP</a> = <a href='010core.cc.html#L62'>End_of_program</a><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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add imm32 0x"</span> << HEXWORD << arg2 << <span class="Constant">" to reg EAX"</span> << 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="L107" class="LineNr">107 </span> <span class="Conceal">¦</span> <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L207'>imm32</a><span class="Delimiter">();</span> +<span id="L108" class="LineNr">108 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add <a href='010core.cc.html#L207'>imm32</a> 0x"</span> << <a href='010core.cc.html#L218'>HEXWORD</a> << arg2 << <span class="Constant">" to <a href='010core.cc.html#L15'>reg</a> EAX"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L109" class="LineNr">109 </span> <span class="Conceal">¦</span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><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="L114" class="LineNr">114 </span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L202'>next</a><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 << <span class="Constant">"unrecognized second opcode after 0f: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L117" class="LineNr">117 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized second opcode after 0f: "</span> << <a href='010core.cc.html#L217'>HEXBYTE</a> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <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="L122" class="LineNr">122 </span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010core.cc.html#L202'>next</a><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="L125" class="LineNr">125 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010core.cc.html#L202'>next</a><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 << <span class="Constant">"unrecognized third opcode after f3 0f: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op3<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L128" class="LineNr">128 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized third opcode after f3 0f: "</span> << <a href='010core.cc.html#L217'>HEXBYTE</a> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> << <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 << <span class="Constant">"unrecognized second opcode after f3: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L133" class="LineNr">133 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized second opcode after f3: "</span> << <a href='010core.cc.html#L217'>HEXBYTE</a> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <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 << <span class="Constant">"unrecognized opcode: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L138" class="LineNr">138 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized opcode: "</span> << <a href='010core.cc.html#L217'>HEXBYTE</a> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <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& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L143" class="LineNr">143 </span><span class="Normal">void</span> <a href='010core.cc.html#L143'>load_program</a><span class="Delimiter">(</span><span class="Normal">const</span> string& 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 >> 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="L147" class="LineNr">147 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L148" class="LineNr">148 </span> <span class="Conceal">¦</span> <span class="Normal">char</span> c1 = <a href='010core.cc.html#L166'>next_hex_byte</a><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 << <span class="Constant">"input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L151" class="LineNr">151 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> << <span class="Constant">"input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><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="L154" class="LineNr">154 </span> <span class="Conceal">¦</span> <span class="Normal">char</span> c2 = <a href='010core.cc.html#L166'>next_hex_byte</a><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 << <span class="Constant">"input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L156" class="LineNr">156 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> << <span class="Constant">"input program truncated mid-byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><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">"load"</span><span class="Delimiter">)</span> << addr << <span class="Constant">" -> "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> << end<span class="Delimiter">();</span> +<span id="L159" class="LineNr">159 </span> <span class="Conceal">¦</span> <a href='010core.cc.html#L61'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> = <a href='010core.cc.html#L192'>to_byte</a><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> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << addr << <span class="Constant">" -> "</span> << <a href='010core.cc.html#L217'>HEXBYTE</a> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span><a href='010core.cc.html#L61'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> << <a href='003trace.cc.html#L184'>end</a><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> End_of_program = addr<span class="Delimiter">;</span> +<span id="L163" class="LineNr">163 </span> <a href='010core.cc.html#L62'>End_of_program</a> = 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& 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="L166" class="LineNr">166 </span><span class="Normal">char</span> <a href='010core.cc.html#L166'>next_hex_byte</a><span class="Delimiter">(</span>istream& 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><a href='001help.cc.html#L188'>has_data</a><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 >> 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="L172" class="LineNr">172 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L188'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L173" class="LineNr">173 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> in >> 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 >> c<span class="Delimiter">;</span> @@ -245,33 +245,33 @@ if ('onhashchange' in window) { <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 >= <span class="Constant">'A'</span> && c <= <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 << <span class="Constant">"invalid non-hex character '"</span> << c << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L185" class="LineNr">185 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L167'>raise</a> << <span class="Constant">"invalid non-hex character '"</span> << c << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L184'>end</a><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="L192" class="LineNr">192 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L192'>to_byte</a><span class="Delimiter">(</span><span class="Normal">char</span> hex_byte1<span class="Delimiter">,</span> <span class="Normal">char</span> hex_byte2<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L193" class="LineNr">193 </span> <span class="Identifier">return</span> <a href='010core.cc.html#L195'>to_hex_num</a><span class="Delimiter">(</span>hex_byte1<span class="Delimiter">)</span>*<span class="Constant">16</span> + <a href='010core.cc.html#L195'>to_hex_num</a><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="L195" class="LineNr">195 </span><span class="Normal">uint8_t</span> <a href='010core.cc.html#L195'>to_hex_num</a><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 >= <span class="Constant">'0'</span> && c <= <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 >= <span class="Constant">'a'</span> && c <= <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="L202" class="LineNr">202 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010core.cc.html#L202'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L203" class="LineNr">203 </span> <span class="Identifier">return</span> <a href='010core.cc.html#L61'>Mem</a><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><<<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><<<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><<<span class="Constant">24</span><span class="Delimiter">);</span> +<span id="L207" class="LineNr">207 </span><span class="Normal">int32_t</span> <a href='010core.cc.html#L207'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L208" class="LineNr">208 </span> <span class="Normal">int32_t</span> result = <a href='010core.cc.html#L202'>next</a><span class="Delimiter">();</span> +<span id="L209" class="LineNr">209 </span> result |= <span class="Delimiter">(</span><a href='010core.cc.html#L202'>next</a><span class="Delimiter">()</span><<<span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L210" class="LineNr">210 </span> result |= <span class="Delimiter">(</span><a href='010core.cc.html#L202'>next</a><span class="Delimiter">()</span><<<span class="Constant">16</span><span class="Delimiter">);</span> +<span id="L211" class="LineNr">211 </span> result |= <span class="Delimiter">(</span><a href='010core.cc.html#L202'>next</a><span class="Delimiter">()</span><<<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> diff --git a/html/subx/011direct_addressing.cc.html b/html/subx/011direct_addressing.cc.html index f6b8edc6..42dd9ea1 100644 --- a/html/subx/011direct_addressing.cc.html +++ b/html/subx/011direct_addressing.cc.html @@ -69,17 +69,17 @@ if ('onhashchange' in window) { <span id="L5" class="LineNr"> 5 </span><span class="Special">% Reg[3].i = 1;</span> <span id="L6" class="LineNr"> 6 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L7" class="LineNr"> 7 </span> <span class="PreProc">0</span><span class="Constant">1</span> d8 <span class="Comment"># add EBX (reg 3) to EAX (reg 0)</span> -<span id="L8" class="LineNr"> 8 </span><span class="traceContains">+run: add 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="L8" class="LineNr"> 8 </span><span class="traceContains">+run: add <a href='010core.cc.html#L15'>reg</a> 3 to effective address</span> +<span id="L9" class="LineNr"> 9 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span> <span id="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 "End Single-Byte Opcodes")</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="L14" class="LineNr">14 </span> <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L202'>next</a><span class="Delimiter">();</span> <span id="L15" class="LineNr">15 </span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add reg "</span> << NUM<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" to effective address"</span> << 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="L16" class="LineNr">16 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add <a href='010core.cc.html#L15'>reg</a> "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" to effective address"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L17" class="LineNr">17 </span> <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L18" class="LineNr">18 </span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><span class="Delimiter">);</span> <span id="L19" class="LineNr">19 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L20" class="LineNr">20 </span><span class="Delimiter">}</span> <span id="L21" class="LineNr">21 </span> @@ -87,7 +87,7 @@ if ('onhashchange' in window) { <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="L26" class="LineNr">26 </span><span class="Normal">int32_t</span>* <a href='011direct_addressing.cc.html#L26'>effective_address</a><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>><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 & <span class="Constant">0x7</span><span class="Delimiter">;</span> @@ -95,12 +95,12 @@ if ('onhashchange' in window) { <span id="L31" class="LineNr">31 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L32" class="LineNr">32 </span> <span class="Normal">case</span> <span class="Constant">3</span>: <span id="L33" class="LineNr">33 </span> <span class="Conceal">¦</span> <span class="Comment">// mod 3 is just register direct addressing</span> -<span id="L34" class="LineNr">34 </span> <span class="Conceal">¦</span> trace<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is reg "</span> << NUM<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L35" class="LineNr">35 </span> <span class="Conceal">¦</span> result = &Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> +<span id="L34" class="LineNr">34 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is <a href='010core.cc.html#L15'>reg</a> "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L35" class="LineNr">35 </span> <span class="Conceal">¦</span> result = &Reg[rm]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><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 << <span class="Constant">"unrecognized mod bits: "</span> << NUM<span class="Delimiter">(</span>mod<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L39" class="LineNr">39 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized mod bits: "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> << <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> @@ -113,17 +113,17 @@ if ('onhashchange' in window) { <span id="L49" class="LineNr">49 </span><span class="Special">% Reg[3].i = 1;</span> <span id="L50" class="LineNr">50 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L51" class="LineNr">51 </span> <span class="Constant">29</span> d8 <span class="Comment"># subtract EBX (reg 3) from EAX (reg 0)</span> -<span id="L52" class="LineNr">52 </span><span class="traceContains">+run: subtract 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="L52" class="LineNr">52 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L15'>reg</a> 3 from effective address</span> +<span id="L53" class="LineNr">53 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 0</span> <span id="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 "End Single-Byte Opcodes")</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="L58" class="LineNr">58 </span> <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L202'>next</a><span class="Delimiter">();</span> <span id="L59" class="LineNr">59 </span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract reg "</span> << NUM<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" from effective address"</span> << 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="L60" class="LineNr">60 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract <a href='010core.cc.html#L15'>reg</a> "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" from effective address"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L61" class="LineNr">61 </span> <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L62" class="LineNr">62 </span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><span class="Delimiter">);</span> <span id="L63" class="LineNr">63 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L64" class="LineNr">64 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/012indirect_addressing.cc.html b/html/subx/012indirect_addressing.cc.html index b5360e6f..8f90ff92 100644 --- a/html/subx/012indirect_addressing.cc.html +++ b/html/subx/012indirect_addressing.cc.html @@ -70,7 +70,7 @@ if ('onhashchange' in window) { <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="L10" class="LineNr">10 </span><span class="traceContains">+run: add <a href='010core.cc.html#L15'>reg</a> 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> @@ -79,9 +79,9 @@ if ('onhashchange' in window) { <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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is mem at address 0x"</span> << std::hex << Reg[rm]<span class="Delimiter">.</span>u << <span class="Constant">" (reg "</span> << NUM<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << 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> <= 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><<span class="Normal">int32_t</span>*><span class="Delimiter">(</span>&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="L19" class="LineNr">19 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is mem at address 0x"</span> << std::hex << Reg[rm]<span class="Delimiter">.</span><a href='010core.cc.html#L17'>u</a> << <span class="Constant">" (reg "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << <a href='003trace.cc.html#L184'>end</a><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><a href='010core.cc.html#L17'>u</a> + <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int32_t</span><span class="Delimiter">)</span> <= <a href='010core.cc.html#L61'>Mem</a><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><<span class="Normal">int32_t</span>*><span class="Delimiter">(</span>&Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Reg[rm]<span class="Delimiter">.</span><a href='010core.cc.html#L17'>u</a><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> @@ -95,17 +95,17 @@ if ('onhashchange' in window) { <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="L35" class="LineNr">35 </span><span class="traceContains">+run: add effective address to <a href='010core.cc.html#L15'>reg</a> 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 "End Single-Byte Opcodes")</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="L41" class="LineNr">41 </span> <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L202'>next</a><span class="Delimiter">();</span> <span id="L42" class="LineNr">42 </span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add effective address to reg "</span> << NUM<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << 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="L43" class="LineNr">43 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add effective address to <a href='010core.cc.html#L15'>reg</a> "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L44" class="LineNr">44 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L45" class="LineNr">45 </span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><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> @@ -117,7 +117,7 @@ if ('onhashchange' in window) { <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="L57" class="LineNr">57 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L15'>reg</a> 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> @@ -129,17 +129,17 @@ if ('onhashchange' in window) { <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="L69" class="LineNr">69 </span><span class="traceContains">+run: subtract effective address from <a href='010core.cc.html#L15'>reg</a> 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 "End Single-Byte Opcodes")</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="L75" class="LineNr">75 </span> <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L202'>next</a><span class="Delimiter">();</span> <span id="L76" class="LineNr">76 </span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract effective address from reg "</span> << NUM<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << 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="L77" class="LineNr">77 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract effective address from <a href='010core.cc.html#L15'>reg</a> "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L78" class="LineNr">78 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L79" class="LineNr">79 </span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><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> diff --git a/html/subx/013immediate_addressing.cc.html b/html/subx/013immediate_addressing.cc.html index afc46f47..3cb55938 100644 --- a/html/subx/013immediate_addressing.cc.html +++ b/html/subx/013immediate_addressing.cc.html @@ -68,26 +68,26 @@ if ('onhashchange' in window) { <span id="L4" class="LineNr"> 4 </span><span class="Special">% Reg[3].i = 1;</span> <span id="L5" class="LineNr"> 5 </span><span class="Comment"># op ModRM SIB displacement immediate</span> <span id="L6" class="LineNr"> 6 </span> <span class="Constant">81</span> c3 0a 0b 0c 0d <span class="Comment"># add 0x0d0c0b0a to EBX (reg 3)</span> -<span id="L7" class="LineNr"> 7 </span><span class="traceContains">+run: combine 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="L7" class="LineNr"> 7 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L207'>imm32</a> 0x0d0c0b0a with effective address</span> +<span id="L8" class="LineNr"> 8 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span> <span id="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 "End Single-Byte Opcodes")</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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"combine imm32 0x"</span> << HEXWORD << arg2 << <span class="Constant">" with effective address"</span> << 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="L14" class="LineNr">14 </span> <span class="Normal">uint8_t</span> modrm = <a href='010core.cc.html#L202'>next</a><span class="Delimiter">();</span> +<span id="L15" class="LineNr">15 </span> <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L207'>imm32</a><span class="Delimiter">();</span> +<span id="L16" class="LineNr">16 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"combine <a href='010core.cc.html#L207'>imm32</a> 0x"</span> << <a href='010core.cc.html#L218'>HEXWORD</a> << arg2 << <span class="Constant">" with effective address"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L17" class="LineNr">17 </span> <span class="Normal">int32_t</span>* arg1 = <a href='011direct_addressing.cc.html#L26'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L18" class="LineNr">18 </span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop add"</span> << 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="L21" class="LineNr">21 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop add"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L22" class="LineNr">22 </span> <span class="Conceal">¦</span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L23" class="LineNr">23 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L24" class="LineNr">24 </span> <span class="Comment">// End Op 81 Subops</span> <span id="L25" class="LineNr">25 </span> <span class="Normal">default</span>: -<span id="L26" class="LineNr">26 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized sub-opcode after 81: "</span> << NUM<span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L26" class="LineNr">26 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"unrecognized sub-opcode after 81: "</span> << <a href='010core.cc.html#L220'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L27" class="LineNr">27 </span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L28" class="LineNr">28 </span> <span class="Delimiter">}</span> <span id="L29" class="LineNr">29 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -100,7 +100,7 @@ if ('onhashchange' in window) { <span id="L36" class="LineNr">36 </span><span class="Special">% 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="L39" class="LineNr">39 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L207'>imm32</a> 0x0d0c0b0a with effective address</span> <span id="L40" class="LineNr">40 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span> <span id="L41" class="LineNr">41 </span><span class="traceContains">+run: subop add</span> <span id="L42" class="LineNr">42 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span> @@ -111,14 +111,14 @@ if ('onhashchange' in window) { <span id="L47" class="LineNr">47 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span> <span id="L48" class="LineNr">48 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L49" class="LineNr">49 </span> 2d 0a 0b 0c 0d <span class="Comment"># subtract 0x0d0c0b0a from EAX (reg 0)</span> -<span id="L50" class="LineNr">50 </span><span class="traceContains">+run: subtract imm32 0x0d0c0b0a from reg EAX</span> +<span id="L50" class="LineNr">50 </span><span class="traceContains">+run: subtract <a href='010core.cc.html#L207'>imm32</a> 0x0d0c0b0a from <a href='010core.cc.html#L15'>reg</a> <a href='010core.cc.html#L5'>EAX</a></span> <span id="L51" class="LineNr">51 </span><span class="traceContains">+run: storing 0x000000a0</span> <span id="L52" class="LineNr">52 </span> <span id="L53" class="LineNr">53 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract imm32 0x"</span> << HEXWORD << arg2 << <span class="Constant">" from reg EAX"</span> << 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="L55" class="LineNr">55 </span> <span class="Normal">int32_t</span> arg2 = <a href='010core.cc.html#L207'>imm32</a><span class="Delimiter">();</span> +<span id="L56" class="LineNr">56 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract <a href='010core.cc.html#L207'>imm32</a> 0x"</span> << <a href='010core.cc.html#L218'>HEXWORD</a> << arg2 << <span class="Constant">" from <a href='010core.cc.html#L15'>reg</a> EAX"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L57" class="LineNr">57 </span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span><a href='010core.cc.html#L16'>i</a><span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L58" class="LineNr">58 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L59" class="LineNr">59 </span><span class="Delimiter">}</span> <span id="L60" class="LineNr">60 </span> @@ -129,7 +129,7 @@ if ('onhashchange' in window) { <span id="L65" class="LineNr">65 </span><span class="Special">% 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="L68" class="LineNr">68 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L207'>imm32</a> 0x00000001 with effective address</span> <span id="L69" class="LineNr">69 </span><span class="traceContains">+run: effective address is mem at address 0x60 (reg 3)</span> <span id="L70" class="LineNr">70 </span><span class="traceContains">+run: subop subtract</span> <span id="L71" class="LineNr">71 </span><span class="traceContains">+run: storing 0x00000009</span> @@ -140,15 +140,15 @@ if ('onhashchange' in window) { <span id="L76" class="LineNr">76 </span><span class="Special">% Reg[3].i = 10;</span> <span id="L77" class="LineNr">77 </span><span class="Comment"># op ModRM SIB displacement immediate</span> <span id="L78" class="LineNr">78 </span> <span class="Constant">81</span> eb <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># subtract 1 from EBX (reg 3)</span> -<span id="L79" class="LineNr">79 </span><span class="traceContains">+run: combine 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="L79" class="LineNr">79 </span><span class="traceContains">+run: combine <a href='010core.cc.html#L207'>imm32</a> 0x00000001 with effective address</span> +<span id="L80" class="LineNr">80 </span><span class="traceContains">+run: effective address is <a href='010core.cc.html#L15'>reg</a> 3</span> <span id="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 "End Op 81 Subops")</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">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop subtract"</span> << 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="L86" class="LineNr">86 </span> <a href='003trace.cc.html#L160'>trace</a><span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop subtract"</span> << <a href='003trace.cc.html#L184'>end</a><span class="Delimiter">();</span> +<span id="L87" class="LineNr">87 </span> <a href='010core.cc.html#L39'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L88" class="LineNr">88 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L89" class="LineNr">89 </span><span class="Delimiter">}</span> </pre> diff --git a/linkify/linkify.cc b/linkify/linkify.cc index 7ed2bc38..14d792c1 100644 --- a/linkify/linkify.cc +++ b/linkify/linkify.cc @@ -84,6 +84,11 @@ void read_tags(const string& filename, map<string, syminfo>& info) { string dummy; while (has_data(in)) { string symbol; in >> symbol; + if (symbol == "operator") { + // unsupported + getline(in, dummy); // skip + continue; + } encode_some_html_entities(symbol); //? cerr << symbol << '\n'; if (info.find(symbol) != info.end()) { @@ -223,8 +228,7 @@ void replace_tags_in_file(const string& filename, const map<string, syminfo>& in int main(int argc, const char* argv[]) { map<string, syminfo> info; read_tags(argv[1], info); - for (int i = 2; i < argc; ++i) { + for (int i = 2; i < argc; ++i) replace_tags_in_file(argv[i], info); - } return 0; } |