diff options
| author | Kartik Agaram <vc@akkartik.com> | 2018-10-28 13:41:53 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2018-10-28 13:41:53 -0700 |
| commit | 4c37b3e91b3e9c891c22379f029c42abc38e408c (patch) | |
| tree | 4ec99b816d7a0d1c93107e16ea1d79e4231e6962 | |
| parent | 172e52c47bd5bd1b189c5160ffda30eb75c39239 (diff) | |
| download | mu-4c37b3e91b3e9c891c22379f029c42abc38e408c.tar.gz | |
4734
34 files changed, 1956 insertions, 1945 deletions
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html index ca4ac190..e3e2abb4 100644 --- a/html/subx/000organization.cc.html +++ b/html/subx/000organization.cc.html @@ -169,12 +169,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#L148'>reset</a><span class="Delimiter">);</span> <span id="L115" class="LineNr">115 </span> <span class="Comment">// we require a 32-bit little-endian 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#L152'>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> @@ -204,11 +204,11 @@ if ('onhashchange' in window) { <span id="L145" class="LineNr">145 </span><span class="Comment">//: 'build' script contains a little command to automatically generate</span> <span id="L146" class="LineNr">146 </span><span class="Comment">//: declarations for them.</span> <span id="L147" class="LineNr">147 </span><span class="Delimiter">:(code)</span> -<span id="L148" class="LineNr">148 </span><span class="Normal">void</span> reset<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L148" class="LineNr">148 </span><span class="Normal">void</span> <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L149" class="LineNr">149 </span> <span class="Comment">// End Reset</span> <span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span> <span id="L151" class="LineNr">151 </span> -<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> assert_little_endian<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> <a href='000organization.cc.html#L152'>assert_little_endian</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L153" class="LineNr">153 </span> <span class="Normal">const</span> <span class="Normal">int</span> x = <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L154" class="LineNr">154 </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="L155" class="LineNr">155 </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 f905d5a7..5b9dbf8d 100644 --- a/html/subx/001help.cc.html +++ b/html/subx/001help.cc.html @@ -62,10 +62,10 @@ 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#L89'>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 << get<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"usage"</span><span class="Delimiter">);</span> +<span id="L8" class="LineNr"> 8 </span> cerr << get<span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"usage"</span><span class="Delimiter">);</span> <span id="L9" class="LineNr"> 9 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L10" class="LineNr"> 10 </span><span class="Delimiter">}</span> <span id="L11" class="LineNr"> 11 </span> @@ -73,7 +73,7 @@ if ('onhashchange' in window) { <span id="L13" class="LineNr"> 13 </span><span class="Comment">//: Options always begin with '--' and are always the first arguments. An</span> <span id="L14" class="LineNr"> 14 </span><span class="Comment">//: option will never follow a non-option.</span> <span id="L15" class="LineNr"> 15 </span><span class="Normal">char</span>** <a href='001help.cc.html#L15'>arg</a> = &argv[<span class="Constant">1</span>]<span class="Delimiter">;</span> -<span id="L16" class="LineNr"> 16 </span><span class="Normal">while</span> <span class="Delimiter">(</span>argc > <span class="Constant">1</span> && starts_with<span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L16" class="LineNr"> 16 </span><span class="Normal">while</span> <span class="Delimiter">(</span>argc > <span class="Constant">1</span> && <a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L17" class="LineNr"> 17 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">)</span> <span id="L18" class="LineNr"> 18 </span> <span class="Delimiter">;</span> <span class="Comment">// no-op branch just so any further additions can consistently always start with 'else'</span> <span id="L19" class="LineNr"> 19 </span> <span class="Comment">// End Commandline Options(*arg)</span> @@ -82,45 +82,45 @@ if ('onhashchange' in window) { <span id="L22" class="LineNr"> 22 </span> --argc<span class="Delimiter">;</span> ++argv<span class="Delimiter">;</span> ++arg<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">if</span> <span class="Delimiter">(</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="L25" class="LineNr"> 25 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"help"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L26" class="LineNr"> 26 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>argc == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L27" class="LineNr"> 27 </span> cerr << <span class="Constant">"help on what?</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L28" class="LineNr"> 28 </span> help_contents<span class="Delimiter">();</span> +<span id="L28" class="LineNr"> 28 </span> <a href='001help.cc.html#L46'>help_contents</a><span class="Delimiter">();</span> <span id="L29" class="LineNr"> 29 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L30" class="LineNr"> 30 </span> <span class="Delimiter">}</span> <span id="L31" class="LineNr"> 31 </span> string key<span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">);</span> <span id="L32" class="LineNr"> 32 </span> <span class="Comment">// End Help Special-cases(key)</span> -<span id="L33" class="LineNr"> 33 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> key<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L34" class="LineNr"> 34 </span> cerr << get<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> key<span class="Delimiter">);</span> +<span id="L33" class="LineNr"> 33 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> key<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L34" class="LineNr"> 34 </span> cerr << get<span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> key<span class="Delimiter">);</span> <span id="L35" class="LineNr"> 35 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L36" class="LineNr"> 36 </span> <span class="Delimiter">}</span> <span id="L37" class="LineNr"> 37 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> <span id="L38" class="LineNr"> 38 </span> cerr << <span class="Constant">"No help found for '"</span> << key << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L39" class="LineNr"> 39 </span> help_contents<span class="Delimiter">();</span> +<span id="L39" class="LineNr"> 39 </span> <a href='001help.cc.html#L46'>help_contents</a><span class="Delimiter">();</span> <span id="L40" class="LineNr"> 40 </span> cerr << <span class="Constant">"Please check your command for typos.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L41" class="LineNr"> 41 </span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L42" class="LineNr"> 42 </span> <span class="Delimiter">}</span> <span id="L43" class="LineNr"> 43 </span><span class="Delimiter">}</span> <span id="L44" class="LineNr"> 44 </span> <span id="L45" class="LineNr"> 45 </span><span class="Delimiter">:(code)</span> -<span id="L46" class="LineNr"> 46 </span><span class="Normal">void</span> help_contents<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L46" class="LineNr"> 46 </span><span class="Normal">void</span> <a href='001help.cc.html#L46'>help_contents</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L47" class="LineNr"> 47 </span> cerr << <span class="Constant">"Available top-level topics:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L48" class="LineNr"> 48 </span> cerr << <span class="Constant">" usage</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L49" class="LineNr"> 49 </span> <span class="Comment">// End Help Contents</span> <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L53" class="LineNr"> 53 </span>map<string<span class="Delimiter">,</span> string> Help<span class="Delimiter">;</span> +<span id="L53" class="LineNr"> 53 </span>map<string<span class="Delimiter">,</span> string> <a href='001help.cc.html#L53'>Help</a><span class="Delimiter">;</span> <span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before "End Includes")</span> <span id="L55" class="LineNr"> 55 </span><span class="Comment">#include <map></span> <span id="L56" class="LineNr"> 56 </span><span class="Normal">using</span> std::map<span class="Delimiter">;</span> <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L58" class="LineNr"> 58 </span>init_help<span class="Delimiter">();</span> +<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">();</span> <span id="L59" class="LineNr"> 59 </span><span class="Delimiter">:(code)</span> -<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> init_help<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L61" class="LineNr"> 61 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"usage"</span><span class="Delimiter">,</span> -<span id="L62" class="LineNr"> 62 </span> <span class="Constant">"Welcome to SubX, a better way to program in machine code.</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L63" class="LineNr"> 63 </span> <span class="Constant">"SubX uses a subset of the x86 instruction set. SubX programs will run</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='001help.cc.html#L60'>init_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L61" class="LineNr"> 61 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"usage"</span><span class="Delimiter">,</span> +<span id="L62" class="LineNr"> 62 </span> <span class="Constant">"Welcome to SubX, a better way to <a href='011run.cc.html#L99'>program</a> in machine code.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L63" class="LineNr"> 63 </span> <span class="Constant">"SubX uses a subset of the x86 instruction set. SubX programs will <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L64" class="LineNr"> 64 </span> <span class="Constant">"without modification on Linux computers.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L65" class="LineNr"> 65 </span> <span class="Constant">"It provides a better experience and better error messages than</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L66" class="LineNr"> 66 </span> <span class="Constant">"programming directly in machine <a href='031check_operands.cc.html#L11'>code</a>, but you have to stick to the</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -131,26 +131,26 @@ if ('onhashchange' in window) { <span id="L71" class="LineNr"> 71 </span> <span class="Constant">" subx test</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L72" class="LineNr"> 72 </span> <span class="Constant">"- See this message:</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L73" class="LineNr"> 73 </span> <span class="Constant">" subx --help</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L74" class="LineNr"> 74 </span> <span class="Constant">"- Convert a textual SubX program into a standard ELF binary that you can</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L75" class="LineNr"> 75 </span> <span class="Constant">" run on your computer:</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L74" class="LineNr"> 74 </span> <span class="Constant">"- Convert a textual SubX <a href='011run.cc.html#L99'>program</a> into a standard ELF binary that you can</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L75" class="LineNr"> 75 </span> <span class="Constant">" <a href='011run.cc.html#L83'>run</a> on your computer:</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L76" class="LineNr"> 76 </span> <span class="Constant">" subx translate input1.subx intput2.subx ... -o <output ELF binary></span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L77" class="LineNr"> 77 </span> <span class="Constant">"- Run a SubX binary using SubX itself (for better error messages):</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L78" class="LineNr"> 78 </span> <span class="Constant">" subx run <ELF binary></span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L79" class="LineNr"> 79 </span> <span class="Constant">"Add '--trace' to any of these commands to also emit a trace, for debugging purposes.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L78" class="LineNr"> 78 </span> <span class="Constant">" subx <a href='011run.cc.html#L83'>run</a> <ELF binary></span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L79" class="LineNr"> 79 </span> <span class="Constant">"Add '--trace' to any of these commands to also emit a <a href='003trace.cc.html#L203'>trace</a>, for debugging purposes.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L80" class="LineNr"> 80 </span> <span class="Constant">"However, options starting with '--' must always come before any other arguments.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L81" class="LineNr"> 81 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L82" class="LineNr"> 82 </span> <span class="Constant">"To start learning how to write SubX programs, run:</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L82" class="LineNr"> 82 </span> <span class="Constant">"To start learning how to write SubX programs, <a href='011run.cc.html#L83'>run</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L83" class="LineNr"> 83 </span> <span class="Constant">" subx help</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L84" class="LineNr"> 84 </span> <span class="Delimiter">);</span> <span id="L85" class="LineNr"> 85 </span> <span class="Comment">// End Help Texts</span> <span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span> <span id="L87" class="LineNr"> 87 </span> <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(code)</span> -<span id="L89" class="LineNr"> 89 </span><span class="Normal">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="L89" class="LineNr"> 89 </span><span class="Normal">bool</span> <a href='001help.cc.html#L89'>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="L90" class="LineNr"> 90 </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="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span> <span id="L92" class="LineNr"> 92 </span> -<span id="L93" class="LineNr"> 93 </span><span class="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="L93" class="LineNr"> 93 </span><span class="Normal">bool</span> <a href='001help.cc.html#L93'>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="L94" class="LineNr"> 94 </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="L95" class="LineNr"> 95 </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="L96" class="LineNr"> 96 </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> @@ -220,20 +220,20 @@ if ('onhashchange' in window) { <span id="L160" class="LineNr">160 </span><span class="Comment">//: to the compiler, supported by Clang (GCC version only works sometimes:</span> <span id="L161" class="LineNr">161 </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="L162" class="LineNr">162 </span><span class="Delimiter">:(before "atexit(reset)")</span> -<span id="L163" class="LineNr">163 </span>initialize_signal_handlers<span class="Delimiter">();</span> <span class="Comment">// not always necessary, but doesn't hurt</span> +<span id="L163" class="LineNr">163 </span><a href='001help.cc.html#L168'>initialize_signal_handlers</a><span class="Delimiter">();</span> <span class="Comment">// not always necessary, but doesn't hurt</span> <span id="L164" class="LineNr">164 </span><span class="CommentedCode">//? cerr << INT_MAX+1 << '\n'; // test overflow</span> <span id="L165" class="LineNr">165 </span><span class="CommentedCode">//? assert(false); // test SIGABRT</span> <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(code)</span> <span id="L167" class="LineNr">167 </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="L168" class="LineNr">168 </span><span class="Normal">void</span> initialize_signal_handlers<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L168" class="LineNr">168 </span><span class="Normal">void</span> <a href='001help.cc.html#L168'>initialize_signal_handlers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L169" class="LineNr">169 </span> <span class="Normal">struct</span> sigaction action<span class="Delimiter">;</span> <span id="L170" class="LineNr">170 </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="L171" class="LineNr">171 </span> action<span class="Delimiter">.</span>sa_sigaction = dump_and_exit<span class="Delimiter">;</span> +<span id="L171" class="LineNr">171 </span> action<span class="Delimiter">.</span>sa_sigaction = <a href='001help.cc.html#L176'>dump_and_exit</a><span class="Delimiter">;</span> <span id="L172" class="LineNr">172 </span> sigemptyset<span class="Delimiter">(</span>&action<span class="Delimiter">.</span>sa_mask<span class="Delimiter">);</span> <span id="L173" class="LineNr">173 </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="L174" class="LineNr">174 </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="L175" class="LineNr">175 </span><span class="Delimiter">}</span> -<span id="L176" class="LineNr">176 </span><span class="Normal">void</span> dump_and_exit<span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> siginfo_t* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <span class="Normal">void</span>* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L176" class="LineNr">176 </span><span class="Normal">void</span> <a href='001help.cc.html#L176'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> siginfo_t* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <span class="Normal">void</span>* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L177" class="LineNr">177 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L178" class="LineNr">178 </span> <span class="Normal">case</span> <span class="Constant">SIGABRT</span>: <span id="L179" class="LineNr">179 </span> <span class="Comment">#ifndef __APPLE__</span> @@ -256,7 +256,7 @@ if ('onhashchange' in window) { <span id="L196" class="LineNr">196 </span> <span id="L197" class="LineNr">197 </span><span class="Comment">//: For good measure we'll also enable SIGFPE.</span> <span id="L198" class="LineNr">198 </span><span class="Delimiter">:(before "atexit(reset)")</span> -<span id="L199" class="LineNr">199 </span>feenableexcept<span class="Delimiter">(</span>FE_OVERFLOW | FE_UNDERFLOW<span class="Delimiter">);</span> +<span id="L199" class="LineNr">199 </span><a href='001help.cc.html#L212'>feenableexcept</a><span class="Delimiter">(</span>FE_OVERFLOW | FE_UNDERFLOW<span class="Delimiter">);</span> <span id="L200" class="LineNr">200 </span><span class="CommentedCode">//? assert(sizeof(int) == 4 && sizeof(float) == 4);</span> <span id="L201" class="LineNr">201 </span><span class="CommentedCode">//? // | exp | mantissa</span> <span id="L202" class="LineNr">202 </span><span class="CommentedCode">//? int smallest_subnormal = 0b00000000000000000000000000000001;</span> @@ -269,7 +269,7 @@ if ('onhashchange' in window) { <span id="L209" class="LineNr">209 </span><span class="Comment">#ifdef __APPLE__</span> <span id="L210" class="LineNr">210 </span><span class="Comment">// Public domain polyfill for feenableexcept on OS X</span> <span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </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="L212" class="LineNr">212 </span><span class="Normal">int</span> <a href='001help.cc.html#L212'>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="L213" class="LineNr">213 </span> <span class="Normal">static</span> fenv_t fenv<span class="Delimiter">;</span> <span id="L214" class="LineNr">214 </span> <span class="Normal">unsigned</span> <span class="Normal">int</span> new_excepts = excepts & FE_ALL_EXCEPT<span class="Delimiter">;</span> <span id="L215" class="LineNr">215 </span> <span class="Normal">unsigned</span> <span class="Normal">int</span> old_excepts<span class="Delimiter">;</span> @@ -300,17 +300,17 @@ if ('onhashchange' in window) { <span id="L240" class="LineNr">240 </span> <span class="Delimiter">}</span> <span id="L241" class="LineNr">241 </span> <span class="Identifier">return</span> iter<span class="Delimiter">-></span>second<span class="Delimiter">;</span> <span id="L242" class="LineNr">242 </span><span class="Delimiter">}</span> -<span id="L243" class="LineNr">243 </span><span class="Normal">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="L243" class="LineNr">243 </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#L243'>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="L244" class="LineNr">244 </span> map[key] = value<span class="Delimiter">;</span> <span id="L245" class="LineNr">245 </span> <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span> <span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span> -<span id="L247" class="LineNr">247 </span><span class="Normal">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="L247" class="LineNr">247 </span><span class="Normal">template</span><<span class="Normal">typename</span> T> <span class="Normal">bool</span> <a href='001help.cc.html#L247'>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="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span><span class="Delimiter">}</span> -<span id="L250" class="LineNr">250 </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="L250" class="LineNr">250 </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#L250'>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="L251" class="LineNr">251 </span> <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span> <span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span> -<span id="L253" class="LineNr">253 </span><span class="Normal">template</span><<span class="Normal">typename</span> T> <span class="Normal">typename</span> T::mapped_type <span class="Normal">const</span>& put_new<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="L253" class="LineNr">253 </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#L253'>put_new</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="L254" class="LineNr">254 </span> assert<span class="Delimiter">(</span>map<span class="Delimiter">.</span>find<span class="Delimiter">(</span>key<span class="Delimiter">)</span> == map<span class="Delimiter">.</span>end<span class="Delimiter">());</span> <span id="L255" class="LineNr">255 </span> map[key] = value<span class="Delimiter">;</span> <span id="L256" class="LineNr">256 </span> <span class="Identifier">return</span> map[key]<span class="Delimiter">;</span> @@ -322,7 +322,7 @@ if ('onhashchange' in window) { <span id="L262" class="LineNr">262 </span><span class="Comment">//: what subclass you try to putback into. You have to watch out for the pesky</span> <span id="L263" class="LineNr">263 </span><span class="Comment">//: failbit and badbit. Just avoid eof() and use this helper instead.</span> <span id="L264" class="LineNr">264 </span><span class="Delimiter">:(code)</span> -<span id="L265" class="LineNr">265 </span><span class="Normal">bool</span> has_data<span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L265" class="LineNr">265 </span><span class="Normal">bool</span> <a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L266" class="LineNr">266 </span> <span class="Identifier">return</span> in && !in<span class="Delimiter">.</span>eof<span class="Delimiter">();</span> <span id="L267" class="LineNr">267 </span><span class="Delimiter">}</span> <span id="L268" class="LineNr">268 </span> diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html index c7dc18fa..8c3c25b9 100644 --- a/html/subx/002test.cc.html +++ b/html/subx/002test.cc.html @@ -72,40 +72,40 @@ 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="Comment">#include "test_list" // auto-generated; see 'build*' scripts</span> <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">};</span> <span id="L18" class="LineNr"> 18 </span> <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before "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="Comment">#define CHECK(X) \</span> -<span id="L25" class="LineNr"> 25 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Passed && !<span class="Delimiter">(</span>X<span class="Delimiter">))</span> <span class="Delimiter">{</span> \ +<span id="L25" class="LineNr"> 25 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && !<span class="Delimiter">(</span>X<span class="Delimiter">))</span> <span class="Delimiter">{</span> \ <span id="L26" class="LineNr"> 26 </span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << __FUNCTION__ << <span class="Constant">"("</span> << <span class="Constant">__FILE__</span> << <span class="Constant">":"</span> << <span class="Constant">__LINE__</span> << <span class="Constant">"): "</span> << <span class="Comment">#X << '\n'; \</span> -<span id="L27" class="LineNr"> 27 </span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \ +<span id="L27" class="LineNr"> 27 </span> <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \ <span id="L28" class="LineNr"> 28 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \ <span id="L29" class="LineNr"> 29 </span> <span class="Delimiter">}</span> <span id="L30" class="LineNr"> 30 </span> <span id="L31" class="LineNr"> 31 </span><span class="Comment">#define CHECK_EQ(X, Y) \</span> -<span id="L32" class="LineNr"> 32 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Passed && <span class="Delimiter">(</span>X<span class="Delimiter">)</span> != <span class="Delimiter">(</span>Y<span class="Delimiter">))</span> <span class="Delimiter">{</span> \ +<span id="L32" class="LineNr"> 32 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && <span class="Delimiter">(</span>X<span class="Delimiter">)</span> != <span class="Delimiter">(</span>Y<span class="Delimiter">))</span> <span class="Delimiter">{</span> \ <span id="L33" class="LineNr"> 33 </span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << __FUNCTION__ << <span class="Constant">"("</span> << <span class="Constant">__FILE__</span> << <span class="Constant">":"</span> << <span class="Constant">__LINE__</span> << <span class="Constant">"): "</span> << <span class="Comment">#X << " == " << #Y << '\n'; \</span> <span id="L34" class="LineNr"> 34 </span> cerr << <span class="Constant">" got "</span> << <span class="Delimiter">(</span>X<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span class="Comment">/*</span><span class="Comment"> BEWARE: multiple eval </span><span class="Comment">*/</span> \ -<span id="L35" class="LineNr"> 35 </span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \ +<span id="L35" class="LineNr"> 35 </span> <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \ <span id="L36" class="LineNr"> 36 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \ <span id="L37" class="LineNr"> 37 </span> <span class="Delimiter">}</span> <span id="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#L89'>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> @@ -113,10 +113,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> i < <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 " << Test_names[i] << '\n';</span> -<span id="L58" class="LineNr"> 58 </span> run_test<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L59" class="LineNr"> 59 </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> <a href='002test.cc.html#L81'>run_test</a><span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L59" class="LineNr"> 59 </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="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> @@ -138,12 +138,12 @@ if ('onhashchange' in window) { <span id="L78" class="LineNr"> 78 </span><span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L79" class="LineNr"> 79 </span> <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(code)</span> -<span id="L81" class="LineNr"> 81 </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="L82" class="LineNr"> 82 </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="L81" class="LineNr"> 81 </span><span class="Normal">void</span> <a href='002test.cc.html#L81'>run_test</a><span class="Delimiter">(</span><span class="Normal">size_t</span> i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L82" class="LineNr"> 82 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i >= <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="L83" class="LineNr"> 83 </span> cerr << <span class="Constant">"no test "</span> << i << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L84" class="LineNr"> 84 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L85" class="LineNr"> 85 </span> <span class="Delimiter">}</span> -<span id="L86" class="LineNr"> 86 </span> reset<span class="Delimiter">();</span> +<span id="L86" class="LineNr"> 86 </span> <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span> <span id="L87" class="LineNr"> 87 </span> <span class="Comment">// End Test Setup</span> <span id="L88" class="LineNr"> 88 </span> <span class="Delimiter">(</span>*Tests[i]<span class="Delimiter">)();</span> <span id="L89" class="LineNr"> 89 </span> <span class="Comment">// End Test Teardown</span> @@ -159,10 +159,10 @@ if ('onhashchange' in window) { <span id="L99" class="LineNr"> 99 </span>string <a href='002test.cc.html#L99'>maybe_single_test_to_run</a> = argv[argc-<span class="Constant">1</span>]<span class="Delimiter">;</span> <span id="L100" class="LineNr">100 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span><a href='002test.cc.html#L99'>maybe_single_test_to_run</a><span class="Delimiter">,</span> <span class="Constant">"test_"</span><span class="Delimiter">))</span> <span id="L101" class="LineNr">101 </span> <a href='002test.cc.html#L99'>maybe_single_test_to_run</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">"test_"</span><span class="Delimiter">);</span> -<span id="L102" class="LineNr">102 </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="L102" class="LineNr">102 </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><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="L103" class="LineNr">103 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Test_names[i] == <a href='002test.cc.html#L99'>maybe_single_test_to_run</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L104" class="LineNr">104 </span> run_test<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L105" class="LineNr">105 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Passed<span class="Delimiter">)</span> cerr << <span class="Constant">".</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L104" class="LineNr">104 </span> <a href='002test.cc.html#L81'>run_test</a><span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L105" class="LineNr">105 </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="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L106" class="LineNr">106 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L107" class="LineNr">107 </span> <span class="Delimiter">}</span> <span id="L108" class="LineNr">108 </span><span class="Delimiter">}</span> diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html index fd4540f8..8f4b68e1 100644 --- a/html/subx/003trace.cc.html +++ b/html/subx/003trace.cc.html @@ -128,129 +128,129 @@ 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="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 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="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> label<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> label<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="Comment">//: Support for tracing an entire run.</span> <span id="L80" class="LineNr"> 80 </span><span class="Comment">//: Traces can have a lot of overhead, so only turn them on when asked.</span> <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(before "End Commandline Options(*arg)")</span> -<span id="L82" class="LineNr"> 82 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_equal<span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--trace"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L83" class="LineNr"> 83 </span> Save_trace =<span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L82" class="LineNr"> 82 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--trace"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L83" class="LineNr"> 83 </span> <a href='003trace.cc.html#L237'>Save_trace</a> =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L84" class="LineNr"> 84 </span><span class="Delimiter">}</span> <span id="L85" class="LineNr"> 85 </span><span class="Delimiter">:(before "End Commandline Parsing")</span> -<span id="L86" class="LineNr"> 86 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L87" class="LineNr"> 87 </span> cerr << <span class="Constant">"initializing trace</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L88" class="LineNr"> 88 </span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> +<span id="L86" class="LineNr"> 86 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L237'>Save_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L87" class="LineNr"> 87 </span> cerr << <span class="Constant">"initializing <a href='003trace.cc.html#L203'>trace</a></span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L88" class="LineNr"> 88 </span> <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span> <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(code)</span> -<span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> cleanup_main<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> <a href='003trace.cc.html#L91'>cleanup_main</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L92" class="LineNr"> 92 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L93" class="LineNr"> 93 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> -<span id="L94" class="LineNr"> 94 </span> Trace_stream<span class="Delimiter">-></span>save<span class="Delimiter">();</span> -<span id="L95" class="LineNr"> 95 </span> <span class="Normal">delete</span> Trace_stream<span class="Delimiter">;</span> -<span id="L96" class="LineNr"> 96 </span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L93" class="LineNr"> 93 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L237'>Save_trace</a><span class="Delimiter">)</span> +<span id="L94" class="LineNr"> 94 </span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span> +<span id="L95" class="LineNr"> 95 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">;</span> +<span id="L96" class="LineNr"> 96 </span> <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span> <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L99" class="LineNr"> 99 </span>atexit<span class="Delimiter">(</span>cleanup_main<span class="Delimiter">);</span> +<span id="L99" class="LineNr"> 99 </span>atexit<span class="Delimiter">(</span><a href='003trace.cc.html#L91'>cleanup_main</a><span class="Delimiter">);</span> <span id="L100" class="LineNr">100 </span> <span id="L101" class="LineNr">101 </span><span class="Delimiter">:(before "End Types")</span> <span id="L102" class="LineNr">102 </span><span class="Comment">// Pre-define some global constants that trace_stream needs to know about.</span> <span id="L103" class="LineNr">103 </span><span class="Comment">// Since they're in the Types section, they'll be included in any cleaved</span> <span id="L104" class="LineNr">104 </span><span class="Comment">// compilation units. So no extern linkage.</span> -<span id="L105" class="LineNr">105 </span><span class="Normal">const</span> <span class="Normal">int</span> Max_depth = <span class="Constant">9999</span><span class="Delimiter">;</span> -<span id="L106" class="LineNr">106 </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="L107" class="LineNr">107 </span><span class="Normal">const</span> <span class="Normal">int</span> Warn_depth = <span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L105" class="LineNr">105 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L105'>Max_depth</a> = <span class="Constant">9999</span><span class="Delimiter">;</span> +<span id="L106" class="LineNr">106 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L106'>Error_depth</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// definitely always print errors</span> +<span id="L107" class="LineNr">107 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='003trace.cc.html#L107'>Warn_depth</a> = <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L108" class="LineNr">108 </span> <span id="L109" class="LineNr">109 </span><span class="Normal">struct</span> trace_stream <span class="Delimiter">{</span> -<span id="L110" class="LineNr">110 </span> vector<trace_line> past_lines<span class="Delimiter">;</span> +<span id="L110" class="LineNr">110 </span> vector<trace_line> <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">;</span> <span id="L111" class="LineNr">111 </span> <span class="Comment">// accumulator for current line</span> -<span id="L112" class="LineNr">112 </span> ostringstream* curr_stream<span class="Delimiter">;</span> -<span id="L113" class="LineNr">113 </span> string curr_label<span class="Delimiter">;</span> -<span id="L114" class="LineNr">114 </span> <span class="Normal">int</span> curr_depth<span class="Delimiter">;</span> -<span id="L115" class="LineNr">115 </span> <span class="Normal">int</span> collect_depth<span class="Delimiter">;</span> +<span id="L112" class="LineNr">112 </span> ostringstream* <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span> +<span id="L113" class="LineNr">113 </span> string <a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">;</span> +<span id="L114" class="LineNr">114 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">;</span> +<span id="L115" class="LineNr">115 </span> <span class="Normal">int</span> <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">;</span> <span id="L116" class="LineNr">116 </span> ofstream<span class="Constant"> null</span>_stream<span class="Delimiter">;</span> <span class="Comment">// never opens a file, so writes silently fail</span> -<span id="L117" class="LineNr">117 </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> collect_depth<span class="Delimiter">(</span>Max_depth<span class="Delimiter">)</span> <span class="Delimiter">{}</span> -<span id="L118" class="LineNr">118 </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="L117" class="LineNr">117 </span> trace_stream<span class="Delimiter">()</span> :<a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">(</span><span class="Constant">NULL</span><span class="Delimiter">),</span> <a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L105'>Max_depth</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">(</span><a href='003trace.cc.html#L105'>Max_depth</a><span class="Delimiter">)</span> <span class="Delimiter">{}</span> +<span id="L118" class="LineNr">118 </span> <a href='003trace.cc.html#L118'>~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#L112'>curr_stream</a><span class="Delimiter">)</span> <span class="Normal">delete</span> <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span> <span class="Delimiter">}</span> <span id="L119" class="LineNr">119 </span> <span id="L120" class="LineNr">120 </span> ostream& stream<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L121" class="LineNr">121 </span> <span class="Identifier">return</span> stream<span class="Delimiter">(</span>Max_depth<span class="Delimiter">,</span> label<span class="Delimiter">);</span> +<span id="L121" class="LineNr">121 </span> <span class="Identifier">return</span> stream<span class="Delimiter">(</span><a href='003trace.cc.html#L105'>Max_depth</a><span class="Delimiter">,</span> label<span class="Delimiter">);</span> <span id="L122" class="LineNr">122 </span> <span class="Delimiter">}</span> <span id="L123" class="LineNr">123 </span> -<span id="L124" class="LineNr">124 </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="L125" class="LineNr">125 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>depth > collect_depth<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span> -<span id="L126" class="LineNr">126 </span> curr_stream = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span> -<span id="L127" class="LineNr">127 </span> curr_label = label<span class="Delimiter">;</span> -<span id="L128" class="LineNr">128 </span> curr_depth = depth<span class="Delimiter">;</span> +<span id="L124" class="LineNr">124 </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 label<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L125" class="LineNr">125 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L72'>depth</a> > <a href='003trace.cc.html#L115'>collect_depth</a><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> null</span>_stream<span class="Delimiter">;</span> +<span id="L126" class="LineNr">126 </span> <a href='003trace.cc.html#L112'>curr_stream</a> = <span class="Normal">new</span> ostringstream<span class="Delimiter">;</span> +<span id="L127" class="LineNr">127 </span> <a href='003trace.cc.html#L113'>curr_label</a> = label<span class="Delimiter">;</span> +<span id="L128" class="LineNr">128 </span> <a href='003trace.cc.html#L114'>curr_depth</a> = <a href='003trace.cc.html#L72'>depth</a><span class="Delimiter">;</span> <span id="L129" class="LineNr">129 </span> <span class="Delimiter">(</span>*curr_stream<span class="Delimiter">)</span> << std::hex<span class="Delimiter">;</span> <span id="L130" class="LineNr">130 </span> <span class="Identifier">return</span> *curr_stream<span class="Delimiter">;</span> <span id="L131" class="LineNr">131 </span> <span class="Delimiter">}</span> <span id="L132" class="LineNr">132 </span> -<span id="L133" class="LineNr">133 </span> <span class="Normal">void</span> save<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L134" class="LineNr">134 </span> cerr << <span class="Constant">"saving trace to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L133" class="LineNr">133 </span> <span class="Normal">void</span> <a href='003trace.cc.html#L133'>save</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L134" class="LineNr">134 </span> cerr << <span class="Constant">"saving <a href='003trace.cc.html#L203'>trace</a> to 'last_run'</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L135" class="LineNr">135 </span> ofstream fout<span class="Delimiter">(</span><span class="Constant">"last_run"</span><span class="Delimiter">);</span> -<span id="L136" class="LineNr">136 </span> fout << readable_contents<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L136" class="LineNr">136 </span> fout << <a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L137" class="LineNr">137 </span> fout<span class="Delimiter">.</span>close<span class="Delimiter">();</span> <span id="L138" class="LineNr">138 </span> <span class="Delimiter">}</span> <span id="L139" class="LineNr">139 </span> <span id="L140" class="LineNr">140 </span> <span class="Comment">// be sure to call this before messing with curr_stream or curr_label</span> -<span id="L141" class="LineNr">141 </span> <span class="Normal">void</span> newline<span class="Delimiter">();</span> +<span id="L141" class="LineNr">141 </span> <span class="Normal">void</span> <a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span> <span id="L142" class="LineNr">142 </span> <span class="Comment">// useful for debugging</span> -<span id="L143" class="LineNr">143 </span> string readable_contents<span class="Delimiter">(</span>string label<span class="Delimiter">);</span> <span class="Comment">// empty label = show everything</span> +<span id="L143" class="LineNr">143 </span> string <a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">);</span> <span class="Comment">// empty label = show everything</span> <span id="L144" class="LineNr">144 </span><span class="Delimiter">};</span> <span id="L145" class="LineNr">145 </span> <span id="L146" class="LineNr">146 </span><span class="Delimiter">:(code)</span> -<span id="L147" class="LineNr">147 </span><span class="Normal">void</span> trace_stream::newline<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L147" class="LineNr">147 </span><span class="Normal">void</span> trace_stream::<a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L148" class="LineNr">148 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L149" class="LineNr">149 </span> string curr_contents = curr_stream<span class="Delimiter">-></span>str<span class="Delimiter">();</span> +<span id="L149" class="LineNr">149 </span> string curr_contents = <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">-></span>str<span class="Delimiter">();</span> <span id="L150" class="LineNr">150 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr_contents<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L151" class="LineNr">151 </span> past_lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span>curr_depth<span class="Delimiter">,</span> 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="L152" class="LineNr">152 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors && curr_depth == Error_depth<span class="Delimiter">)</span> -<span id="L153" class="LineNr">153 </span> || <span class="Delimiter">(</span>!Hide_warnings && !Hide_errors && curr_depth == Warn_depth<span class="Delimiter">)</span> -<span id="L154" class="LineNr">154 </span> || Dump_trace -<span id="L155" class="LineNr">155 </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="L156" class="LineNr">156 </span> cerr << curr_label << <span class="Constant">": "</span> << curr_contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L151" class="LineNr">151 </span> <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>trace_line<span class="Delimiter">(</span><a href='003trace.cc.html#L114'>curr_depth</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">),</span> curr_contents<span class="Delimiter">));</span> <span class="Comment">// preserve indent in contents</span> +<span id="L152" class="LineNr">152 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>!Hide_errors && <a href='003trace.cc.html#L114'>curr_depth</a> == <a href='003trace.cc.html#L106'>Error_depth</a><span class="Delimiter">)</span> +<span id="L153" class="LineNr">153 </span> || <span class="Delimiter">(</span>!Hide_warnings && !Hide_errors && <a href='003trace.cc.html#L114'>curr_depth</a> == <a href='003trace.cc.html#L107'>Warn_depth</a><span class="Delimiter">)</span> +<span id="L154" class="LineNr">154 </span> || <a href='003trace.cc.html#L188'>Dump_trace</a> +<span id="L155" class="LineNr">155 </span> || <span class="Delimiter">(</span>!Dump_label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> && <a href='003trace.cc.html#L113'>curr_label</a> == <a href='003trace.cc.html#L189'>Dump_label</a><span class="Delimiter">))</span> +<span id="L156" class="LineNr">156 </span> cerr << <a href='003trace.cc.html#L113'>curr_label</a> << <span class="Constant">": "</span> << curr_contents << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L157" class="LineNr">157 </span> <span class="Delimiter">}</span> -<span id="L158" class="LineNr">158 </span> <span class="Normal">delete</span> curr_stream<span class="Delimiter">;</span> -<span id="L159" class="LineNr">159 </span> curr_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L160" class="LineNr">160 </span> curr_label<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L161" class="LineNr">161 </span> curr_depth = Max_depth<span class="Delimiter">;</span> +<span id="L158" class="LineNr">158 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L112'>curr_stream</a><span class="Delimiter">;</span> +<span id="L159" class="LineNr">159 </span> <a href='003trace.cc.html#L112'>curr_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L160" class="LineNr">160 </span> <a href='003trace.cc.html#L113'>curr_label</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L161" class="LineNr">161 </span> <a href='003trace.cc.html#L114'>curr_depth</a> = <a href='003trace.cc.html#L105'>Max_depth</a><span class="Delimiter">;</span> <span id="L162" class="LineNr">162 </span><span class="Delimiter">}</span> <span id="L163" class="LineNr">163 </span> -<span id="L164" class="LineNr">164 </span>string trace_stream::readable_contents<span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L164" class="LineNr">164 </span>string trace_stream::<a href='003trace.cc.html#L164'>readable_contents</a><span class="Delimiter">(</span>string label<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L165" class="LineNr">165 </span> ostringstream output<span class="Delimiter">;</span> -<span id="L166" class="LineNr">166 </span> label = trim<span class="Delimiter">(</span>label<span class="Delimiter">);</span> -<span id="L167" class="LineNr">167 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<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="L166" class="LineNr">166 </span> label = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> +<span id="L167" class="LineNr">167 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span id="L168" class="LineNr">168 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || label == p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> -<span id="L169" class="LineNr">169 </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="L169" class="LineNr">169 </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>label << <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="L170" class="LineNr">170 </span> <span class="Identifier">return</span> output<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L171" class="LineNr">171 </span><span class="Delimiter">}</span> <span id="L172" class="LineNr">172 </span> <span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L174" class="LineNr">174 </span>trace_stream* Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L175" class="LineNr">175 </span><span class="Normal">int</span> Trace_errors = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// used only when Trace_stream is NULL</span> +<span id="L174" class="LineNr">174 </span>trace_stream* <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L175" class="LineNr">175 </span><span class="Normal">int</span> <a href='003trace.cc.html#L175'>Trace_errors</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// used only when Trace_stream is NULL</span> <span id="L176" class="LineNr">176 </span> <span id="L177" class="LineNr">177 </span><span class="Comment">//: option to print trace to the screen</span> <span id="L178" class="LineNr">178 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> Flag_dump_trace =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L179" class="LineNr">179 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L179'>Flag_dump_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L180" class="LineNr">180 </span><span class="Delimiter">:(before "End Commandline Options(*arg)")</span> -<span id="L181" class="LineNr">181 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_equal<span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--dump"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L182" class="LineNr">182 </span> Flag_dump_trace =<span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L181" class="LineNr">181 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--dump"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L182" class="LineNr">182 </span> <a href='003trace.cc.html#L179'>Flag_dump_trace</a> =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span> <span id="L184" class="LineNr">184 </span> <span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before "End Globals")</span> <span id="L186" class="LineNr">186 </span><span class="Normal">bool</span> Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// if set, don't print even error trace lines to screen</span> <span id="L187" class="LineNr">187 </span><span class="Normal">bool</span> Hide_warnings =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// if set, don't print warnings to screen</span> -<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> Dump_trace =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// if set, print trace lines to screen</span> -<span id="L189" class="LineNr">189 </span>string Dump_label = <span class="Constant">""</span><span class="Delimiter">;</span> <span class="Comment">// if set, print trace lines matching a single label to screen</span> +<span id="L188" class="LineNr">188 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L188'>Dump_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// if set, print trace lines to screen</span> +<span id="L189" class="LineNr">189 </span>string <a href='003trace.cc.html#L189'>Dump_label</a> = <span class="Constant">""</span><span class="Delimiter">;</span> <span class="Comment">// if set, print trace lines matching a single label to screen</span> <span id="L190" class="LineNr">190 </span><span class="Delimiter">:(before "End Reset")</span> <span id="L191" class="LineNr">191 </span>Hide_errors =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L192" class="LineNr">192 </span>Hide_warnings =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L193" class="LineNr">193 </span>Dump_trace = Flag_dump_trace<span class="Delimiter">;</span> -<span id="L194" class="LineNr">194 </span>Dump_label = <span class="Constant">""</span><span class="Delimiter">;</span> +<span id="L193" class="LineNr">193 </span><a href='003trace.cc.html#L188'>Dump_trace</a> = <a href='003trace.cc.html#L179'>Flag_dump_trace</a><span class="Delimiter">;</span> +<span id="L194" class="LineNr">194 </span><a href='003trace.cc.html#L189'>Dump_label</a> = <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L195" class="LineNr">195 </span><span class="Comment">//: Never dump warnings in scenarios</span> <span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before "End Test Setup")</span> <span id="L197" class="LineNr">197 </span>Hide_warnings =<span class="Constant"> true</span><span class="Delimiter">;</span> @@ -276,115 +276,115 @@ if ('onhashchange' in window) { <span id="L217" class="LineNr">217 </span><span class="Comment">// Inside tests, fail any tests that displayed (unexpected) errors.</span> <span id="L218" class="LineNr">218 </span><span class="Comment">// Expected errors in tests should always be hidden and silently checked for.</span> <span id="L219" class="LineNr">219 </span><span class="Delimiter">:(before "End Test Teardown")</span> -<span id="L220" class="LineNr">220 </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="L221" class="LineNr">221 </span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L220" class="LineNr">220 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && !Hide_errors && <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L221" class="LineNr">221 </span> <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L222" class="LineNr">222 </span><span class="Delimiter">}</span> <span id="L223" class="LineNr">223 </span><span class="Delimiter">:(code)</span> -<span id="L224" class="LineNr">224 </span><span class="Normal">bool</span> trace_contains_errors<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L225" class="LineNr">225 </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="L224" class="LineNr">224 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L225" class="LineNr">225 </span> <span class="Identifier">return</span> <a href='003trace.cc.html#L175'>Trace_errors</a> > <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="L226" class="LineNr">226 </span><span class="Delimiter">}</span> <span id="L227" class="LineNr">227 </span> <span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before "End Types")</span> <span id="L229" class="LineNr">229 </span><span class="Normal">struct</span> end <span class="Delimiter">{};</span> <span id="L230" class="LineNr">230 </span><span class="Delimiter">:(code)</span> <span id="L231" class="LineNr">231 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> end <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L232" class="LineNr">232 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-></span>newline<span class="Delimiter">();</span> +<span id="L232" class="LineNr">232 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span> <span id="L233" class="LineNr">233 </span> <span class="Identifier">return</span> os<span class="Delimiter">;</span> <span id="L234" class="LineNr">234 </span><span class="Delimiter">}</span> <span id="L235" class="LineNr">235 </span> <span id="L236" class="LineNr">236 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L237" class="LineNr">237 </span><span class="Normal">bool</span> Save_trace =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// if set, write out trace to disk</span> +<span id="L237" class="LineNr">237 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L237'>Save_trace</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// if set, write out trace to disk</span> <span id="L238" class="LineNr">238 </span> <span id="L239" class="LineNr">239 </span><span class="Comment">// Trace_stream is a resource, lease_tracer uses RAII to manage it.</span> <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before "End Types")</span> <span id="L241" class="LineNr">241 </span><span class="Normal">struct</span> lease_tracer <span class="Delimiter">{</span> <span id="L242" class="LineNr">242 </span> lease_tracer<span class="Delimiter">();</span> -<span id="L243" class="LineNr">243 </span> ~lease_tracer<span class="Delimiter">();</span> +<span id="L243" class="LineNr">243 </span> <a href='003trace.cc.html#L247'>~lease_tracer</a><span class="Delimiter">();</span> <span id="L244" class="LineNr">244 </span><span class="Delimiter">};</span> <span id="L245" class="LineNr">245 </span><span class="Delimiter">:(code)</span> -<span id="L246" class="LineNr">246 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> Trace_stream = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span> -<span id="L247" class="LineNr">247 </span>lease_tracer::~lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L248" class="LineNr">248 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Save_trace<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-></span>save<span class="Delimiter">();</span> -<span id="L249" class="LineNr">249 </span> <span class="Normal">delete</span> Trace_stream<span class="Delimiter">,</span> Trace_stream = <span class="Constant">NULL</span><span class="Delimiter">;</span> +<span id="L246" class="LineNr">246 </span>lease_tracer::lease_tracer<span class="Delimiter">()</span> <span class="Delimiter">{</span> <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Normal">new</span> trace_stream<span class="Delimiter">;</span> <span class="Delimiter">}</span> +<span id="L247" class="LineNr">247 </span>lease_tracer::<a href='003trace.cc.html#L247'>~lease_tracer</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L248" class="LineNr">248 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L237'>Save_trace</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L133'>save</a><span class="Delimiter">();</span> +<span id="L249" class="LineNr">249 </span> <span class="Normal">delete</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L174'>Trace_stream</a> = <span class="Constant">NULL</span><span class="Delimiter">;</span> <span id="L250" class="LineNr">250 </span><span class="Delimiter">}</span> <span id="L251" class="LineNr">251 </span><span class="Delimiter">:(before "End Includes")</span> <span id="L252" class="LineNr">252 </span><span class="Comment">#define START_TRACING_UNTIL_END_OF_SCOPE lease_tracer leased_tracer;</span> <span id="L253" class="LineNr">253 </span><span class="Delimiter">:(before "End Test Setup")</span> -<span id="L254" class="LineNr">254 </span>START_TRACING_UNTIL_END_OF_SCOPE +<span id="L254" class="LineNr">254 </span><a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a> <span id="L255" class="LineNr">255 </span> <span id="L256" class="LineNr">256 </span><span class="Delimiter">:(before "End Includes")</span> <span id="L257" class="LineNr">257 </span><span class="Comment">#define CHECK_TRACE_CONTENTS(...) check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)</span> <span id="L258" class="LineNr">258 </span> <span id="L259" class="LineNr">259 </span><span class="Comment">#define CHECK_TRACE_CONTAINS_ERRORS() CHECK(trace_contains_errors())</span> <span id="L260" class="LineNr">260 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN_ERRORS() \</span> -<span id="L261" class="LineNr">261 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Passed && trace_contains_errors<span class="Delimiter">())</span> <span class="Delimiter">{</span> \ +<span id="L261" class="LineNr">261 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && <a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> \ <span id="L262" class="LineNr">262 </span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << __FUNCTION__ << <span class="Constant">"("</span> << <span class="Constant">__FILE__</span> << <span class="Constant">":"</span> << <span class="Constant">__LINE__</span> << <span class="Constant">"): unexpected errors</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> \ -<span id="L263" class="LineNr">263 </span> DUMP<span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">);</span> \ -<span id="L264" class="LineNr">264 </span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \ +<span id="L263" class="LineNr">263 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">"error"</span><span class="Delimiter">);</span> \ +<span id="L264" class="LineNr">264 </span> <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \ <span id="L265" class="LineNr">265 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> \ <span id="L266" class="LineNr">266 </span> <span class="Delimiter">}</span> <span id="L267" class="LineNr">267 </span> <span id="L268" class="LineNr">268 </span><span class="Comment">#define CHECK_TRACE_COUNT(label, count) \</span> -<span id="L269" class="LineNr">269 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Passed && trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> != <span class="Delimiter">(</span>count<span class="Delimiter">))</span> <span class="Delimiter">{</span> \ +<span id="L269" class="LineNr">269 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='002test.cc.html#L21'>Passed</a> && trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> != <span class="Delimiter">(</span>count<span class="Delimiter">))</span> <span class="Delimiter">{</span> \ <span id="L270" class="LineNr">270 </span> cerr << <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">F - "</span> << __FUNCTION__ << <span class="Constant">"("</span> << <span class="Constant">__FILE__</span> << <span class="Constant">":"</span> << <span class="Constant">__LINE__</span> << <span class="Constant">"): trace_count of "</span> << label << <span class="Constant">" should be "</span> << count << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> \ <span id="L271" class="LineNr">271 </span> cerr << <span class="Constant">" got "</span> << trace_count<span class="Delimiter">(</span>label<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span class="Comment">/*</span><span class="Comment"> multiple eval </span><span class="Comment">*/</span> \ -<span id="L272" class="LineNr">272 </span> DUMP<span class="Delimiter">(</span>label<span class="Delimiter">);</span> \ -<span id="L273" class="LineNr">273 </span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> \ +<span id="L272" class="LineNr">272 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> \ +<span id="L273" class="LineNr">273 </span> <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \ <span id="L274" class="LineNr">274 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">/*</span><span class="Comment"> Currently we stop at the very first failure. </span><span class="Comment">*/</span> \ <span id="L275" class="LineNr">275 </span> <span class="Delimiter">}</span> <span id="L276" class="LineNr">276 </span> <span id="L277" class="LineNr">277 </span><span class="Comment">#define CHECK_TRACE_DOESNT_CONTAIN(...) CHECK(trace_doesnt_contain(__VA_ARGS__))</span> <span id="L278" class="LineNr">278 </span> <span id="L279" class="LineNr">279 </span><span class="Delimiter">:(code)</span> -<span id="L280" class="LineNr">280 </span><span class="Normal">bool</span> 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="L280" class="LineNr">280 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L280'>check_trace_contents</a><span class="Delimiter">(</span>string FUNCTION<span class="Delimiter">,</span> string <span class="Normal">FILE</span><span class="Delimiter">,</span> <span class="Normal">int</span> LINE<span class="Delimiter">,</span> string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L281" class="LineNr">281 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Passed<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L282" class="LineNr">282 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L283" class="LineNr">283 </span> vector<string> expected_lines = split<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">"^D"</span><span class="Delimiter">);</span> +<span id="L283" class="LineNr">283 </span> vector<string> expected_lines = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">"^D"</span><span class="Delimiter">);</span> <span id="L284" class="LineNr">284 </span> <span class="Normal">int</span> curr_expected_line = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L285" class="LineNr">285 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < 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="L285" class="LineNr">285 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span> <span id="L286" class="LineNr">286 </span> ++curr_expected_line<span class="Delimiter">;</span> -<span id="L287" class="LineNr">287 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == 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="L288" class="LineNr">288 </span> string label<span class="Delimiter">,</span> contents<span class="Delimiter">;</span> -<span id="L289" class="LineNr">289 </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="L290" class="LineNr">290 </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="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L288" class="LineNr">288 </span> string label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">;</span> +<span id="L289" class="LineNr">289 </span> <a href='003trace.cc.html#L312'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> +<span id="L290" class="LineNr">290 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L291" class="LineNr">291 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L292" class="LineNr">292 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>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="L292" class="LineNr">292 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> != <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L293" class="LineNr">293 </span> ++curr_expected_line<span class="Delimiter">;</span> -<span id="L294" class="LineNr">294 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < 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="L294" class="LineNr">294 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>curr_expected_line < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">)</span> && expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">).</span>empty<span class="Delimiter">())</span> <span id="L295" class="LineNr">295 </span> ++curr_expected_line<span class="Delimiter">;</span> -<span id="L296" class="LineNr">296 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == 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="L297" class="LineNr">297 </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="L296" class="LineNr">296 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr_expected_line == <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L297" class="LineNr">297 </span> <a href='003trace.cc.html#L312'>split_label_contents</a><span class="Delimiter">(</span>expected_lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>curr_expected_line<span class="Delimiter">),</span> &label<span class="Delimiter">,</span> &contents<span class="Delimiter">);</span> <span id="L298" class="LineNr">298 </span> <span class="Delimiter">}</span> <span id="L299" class="LineNr">299 </span> -<span id="L300" class="LineNr">300 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>line_exists_anywhere<span class="Delimiter">(</span>label<span class="Delimiter">,</span> contents<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L301" class="LineNr">301 </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="L302" class="LineNr">302 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L300" class="LineNr">300 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L325'>line_exists_anywhere</a><span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L301" class="LineNr">301 </span> cerr << <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">"): <a href='011run.cc.html#L117'>line</a> ["</span> << label << <span class="Constant">": "</span> << <a href='003trace.cc.html#L74'>contents</a> << <span class="Constant">"] out of order in <a href='003trace.cc.html#L203'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L302" class="LineNr">302 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L303" class="LineNr">303 </span> <span class="Delimiter">}</span> <span id="L304" class="LineNr">304 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L305" class="LineNr">305 </span> cerr << <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="L306" class="LineNr">306 </span> DUMP<span class="Delimiter">(</span>label<span class="Delimiter">);</span> +<span id="L305" class="LineNr">305 </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#L203'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L306" class="LineNr">306 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> <span id="L307" class="LineNr">307 </span> <span class="Delimiter">}</span> -<span id="L308" class="LineNr">308 </span> Passed =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L308" class="LineNr">308 </span> <a href='002test.cc.html#L21'>Passed</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L309" class="LineNr">309 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L310" class="LineNr">310 </span><span class="Delimiter">}</span> <span id="L311" class="LineNr">311 </span> -<span id="L312" class="LineNr">312 </span><span class="Normal">void</span> 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="L312" class="LineNr">312 </span><span class="Normal">void</span> <a href='003trace.cc.html#L312'>split_label_contents</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">,</span> string* label<span class="Delimiter">,</span> string* <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L313" class="LineNr">313 </span> <span class="Normal">static</span> <span class="Normal">const</span> string delim<span class="Delimiter">(</span><span class="Constant">": "</span><span class="Delimiter">);</span> <span id="L314" class="LineNr">314 </span> <span class="Normal">size_t</span> pos = s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span> <span id="L315" class="LineNr">315 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>pos == string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L316" class="LineNr">316 </span> *label = <span class="Constant">""</span><span class="Delimiter">;</span> -<span id="L317" class="LineNr">317 </span> *contents = trim<span class="Delimiter">(</span>s<span class="Delimiter">);</span> +<span id="L317" class="LineNr">317 </span> *contents = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">);</span> <span id="L318" class="LineNr">318 </span> <span class="Delimiter">}</span> <span id="L319" class="LineNr">319 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L320" class="LineNr">320 </span> *label = 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="L321" class="LineNr">321 </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="L320" class="LineNr">320 </span> *label = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> pos<span class="Delimiter">));</span> +<span id="L321" class="LineNr">321 </span> *contents = <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span>pos+SIZE<span class="Delimiter">(</span>delim<span class="Delimiter">)));</span> <span id="L322" class="LineNr">322 </span> <span class="Delimiter">}</span> <span id="L323" class="LineNr">323 </span><span class="Delimiter">}</span> <span id="L324" class="LineNr">324 </span> -<span id="L325" class="LineNr">325 </span><span class="Normal">bool</span> 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="L326" class="LineNr">326 </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="L325" class="LineNr">325 </span><span class="Normal">bool</span> <a href='003trace.cc.html#L325'>line_exists_anywhere</a><span class="Delimiter">(</span><span class="Normal">const</span> string& label<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="L326" class="LineNr">326 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L327" class="LineNr">327 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label != p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L328" class="LineNr">328 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>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="L328" class="LineNr">328 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L74'>contents</a> == <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L329" class="LineNr">329 </span> <span class="Delimiter">}</span> <span id="L330" class="LineNr">330 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span> @@ -393,44 +393,44 @@ if ('onhashchange' in window) { <span id="L334" class="LineNr">334 </span> <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <span class="Constant">""</span><span class="Delimiter">);</span> <span id="L335" class="LineNr">335 </span><span class="Delimiter">}</span> <span id="L336" class="LineNr">336 </span> -<span id="L337" class="LineNr">337 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L337" class="LineNr">337 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L338" class="LineNr">338 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L339" class="LineNr">339 </span> <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L340" class="LineNr">340 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<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="L340" class="LineNr">340 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L341" class="LineNr">341 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L342" class="LineNr">342 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>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="L342" class="LineNr">342 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a> == <span class="Constant">""</span> || <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span id="L343" class="LineNr">343 </span> ++result<span class="Delimiter">;</span> <span id="L344" class="LineNr">344 </span> <span class="Delimiter">}</span> <span id="L345" class="LineNr">345 </span> <span class="Delimiter">}</span> <span id="L346" class="LineNr">346 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L347" class="LineNr">347 </span><span class="Delimiter">}</span> <span id="L348" class="LineNr">348 </span> -<span id="L349" class="LineNr">349 </span><span class="Normal">int</span> 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="L349" class="LineNr">349 </span><span class="Normal">int</span> <a href='003trace.cc.html#L349'>trace_count_prefix</a><span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string prefix<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L350" class="LineNr">350 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L351" class="LineNr">351 </span> <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L352" class="LineNr">352 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<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="L352" class="LineNr">352 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>vector<trace_line>::iterator p = <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L353" class="LineNr">353 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label == p<span class="Delimiter">-></span>label<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L354" class="LineNr">354 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>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="L354" class="LineNr">354 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">),</span> <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span>prefix<span class="Delimiter">)))</span> <span id="L355" class="LineNr">355 </span> ++result<span class="Delimiter">;</span> <span id="L356" class="LineNr">356 </span> <span class="Delimiter">}</span> <span id="L357" class="LineNr">357 </span> <span class="Delimiter">}</span> <span id="L358" class="LineNr">358 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L359" class="LineNr">359 </span><span class="Delimiter">}</span> <span id="L360" class="LineNr">360 </span> -<span id="L361" class="LineNr">361 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string line<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L362" class="LineNr">362 </span> <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> line<span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L361" class="LineNr">361 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string label<span class="Delimiter">,</span> string <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L362" class="LineNr">362 </span> <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span>label<span class="Delimiter">,</span> <a href='011run.cc.html#L117'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L363" class="LineNr">363 </span><span class="Delimiter">}</span> <span id="L364" class="LineNr">364 </span> <span id="L365" class="LineNr">365 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L366" class="LineNr">366 </span> vector<string> tmp = split_first<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">": "</span><span class="Delimiter">);</span> -<span id="L367" class="LineNr">367 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>tmp<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L368" class="LineNr">368 </span> raise << expected << <span class="Constant">": missing label or contents in trace line</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L366" class="LineNr">366 </span> vector<string> tmp = <a href='003trace.cc.html#L389'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">": "</span><span class="Delimiter">);</span> +<span id="L367" class="LineNr">367 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>tmp<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L368" class="LineNr">368 </span> <a href='003trace.cc.html#L210'>raise</a> << expected << <span class="Constant">": missing label or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L203'>trace</a> <a href='011run.cc.html#L117'>line</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L369" class="LineNr">369 </span> assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span> <span id="L370" class="LineNr">370 </span> <span class="Delimiter">}</span> <span id="L371" class="LineNr">371 </span> <span class="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span> <span id="L372" class="LineNr">372 </span><span class="Delimiter">}</span> <span id="L373" class="LineNr">373 </span> -<span id="L374" class="LineNr">374 </span>vector<string> split<span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L374" class="LineNr">374 </span>vector<string> <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L375" class="LineNr">375 </span> vector<string> result<span class="Delimiter">;</span> <span id="L376" class="LineNr">376 </span> <span class="Normal">size_t</span> begin=<span class="Constant">0</span><span class="Delimiter">,</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span> <span id="L377" class="LineNr">377 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -445,7 +445,7 @@ if ('onhashchange' in window) { <span id="L386" class="LineNr">386 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L387" class="LineNr">387 </span><span class="Delimiter">}</span> <span id="L388" class="LineNr">388 </span> -<span id="L389" class="LineNr">389 </span>vector<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="L389" class="LineNr">389 </span>vector<string> <a href='003trace.cc.html#L389'>split_first</a><span class="Delimiter">(</span>string s<span class="Delimiter">,</span> string delim<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L390" class="LineNr">390 </span> vector<string> result<span class="Delimiter">;</span> <span id="L391" class="LineNr">391 </span> <span class="Normal">size_t</span> end=s<span class="Delimiter">.</span>find<span class="Delimiter">(</span>delim<span class="Delimiter">);</span> <span id="L392" class="LineNr">392 </span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span>s<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> end<span class="Delimiter">));</span> @@ -454,7 +454,7 @@ if ('onhashchange' in window) { <span id="L395" class="LineNr">395 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L396" class="LineNr">396 </span><span class="Delimiter">}</span> <span id="L397" class="LineNr">397 </span> -<span id="L398" class="LineNr">398 </span>string trim<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L398" class="LineNr">398 </span>string <a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L399" class="LineNr">399 </span> string::const_iterator first = s<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> <span id="L400" class="LineNr">400 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>first != s<span class="Delimiter">.</span>end<span class="Delimiter">()</span> && isspace<span class="Delimiter">(</span>*first<span class="Delimiter">))</span> <span id="L401" class="LineNr">401 </span> ++first<span class="Delimiter">;</span> diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html index 950d490d..e6e3689c 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#L203'>trace</a><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> <a href='003trace.cc.html#L257'>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#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <a href='003trace.cc.html#L257'>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#L277'>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#L203'>trace</a><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> <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#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <a href='003trace.cc.html#L257'>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#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <a href='003trace.cc.html#L257'>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#L203'>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> << end<span class="Delimiter">();</span> +<span id="L33" class="LineNr"> 33 </span> <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span><span class="Constant">"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#L203'>trace</a><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> <a href='003trace.cc.html#L257'>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#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <a href='003trace.cc.html#L257'>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#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <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#L203'>trace</a><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> <a href='003trace.cc.html#L203'>trace</a><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> <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#L203'>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> << end<span class="Delimiter">();</span> +<span id="L62" class="LineNr"> 62 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>trace_count<span class="Delimiter">(</span><span class="Constant">"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> @@ -132,55 +132,55 @@ if ('onhashchange' in window) { <span id="L74" class="LineNr"> 74 </span> <span id="L75" class="LineNr"> 75 </span><span class="Comment">// can't check trace because trace methods call 'split'</span> <span id="L76" class="LineNr"> 76 </span> -<span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> test_split_returns_at_least_one_elem<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L78" class="LineNr"> 78 </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="L79" class="LineNr"> 79 </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="L80" class="LineNr"> 80 </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="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L77'>test_split_returns_at_least_one_elem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L78" class="LineNr"> 78 </span> vector<string> result = <a href='003trace.cc.html#L374'>split</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">,</span> <span class="Constant">","</span><span class="Delimiter">);</span> +<span id="L79" class="LineNr"> 79 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L80" class="LineNr"> 80 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">""</span><span class="Delimiter">);</span> <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">}</span> <span id="L82" class="LineNr"> 82 </span> -<span id="L83" class="LineNr"> 83 </span><span class="Normal">void</span> test_split_returns_entire_input_when_no_delim<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L84" class="LineNr"> 84 </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="L85" class="LineNr"> 85 </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="L86" class="LineNr"> 86 </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="L83" class="LineNr"> 83 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L83'>test_split_returns_entire_input_when_no_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L84" class="LineNr"> 84 </span> vector<string> result = <a href='003trace.cc.html#L374'>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="L85" class="LineNr"> 85 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L86" class="LineNr"> 86 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> <span id="L87" class="LineNr"> 87 </span><span class="Delimiter">}</span> <span id="L88" class="LineNr"> 88 </span> -<span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> test_split_works<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L90" class="LineNr"> 90 </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="L91" class="LineNr"> 91 </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="L92" class="LineNr"> 92 </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="L93" class="LineNr"> 93 </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="L89" class="LineNr"> 89 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L89'>test_split_works</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L90" class="LineNr"> 90 </span> vector<string> result = <a href='003trace.cc.html#L374'>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="L91" class="LineNr"> 91 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L92" class="LineNr"> 92 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> +<span id="L93" class="LineNr"> 93 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">"def"</span><span class="Delimiter">);</span> <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span> <span id="L95" class="LineNr"> 95 </span> -<span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> test_split_works2<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L97" class="LineNr"> 97 </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="L98" class="LineNr"> 98 </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="L99" class="LineNr"> 99 </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="L100" class="LineNr">100 </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="L101" class="LineNr">101 </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="L96" class="LineNr"> 96 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L96'>test_split_works2</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L97" class="LineNr"> 97 </span> vector<string> result = <a href='003trace.cc.html#L374'>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="L98" class="LineNr"> 98 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L99" class="LineNr"> 99 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> +<span id="L100" class="LineNr">100 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">"def"</span><span class="Delimiter">);</span> +<span id="L101" class="LineNr">101 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">"ghi"</span><span class="Delimiter">);</span> <span id="L102" class="LineNr">102 </span><span class="Delimiter">}</span> <span id="L103" class="LineNr">103 </span> -<span id="L104" class="LineNr">104 </span><span class="Normal">void</span> test_split_handles_multichar_delim<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L105" class="LineNr">105 </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="L106" class="LineNr">106 </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="L107" class="LineNr">107 </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="L108" class="LineNr">108 </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="L109" class="LineNr">109 </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="L104" class="LineNr">104 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L104'>test_split_handles_multichar_delim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L105" class="LineNr">105 </span> vector<string> result = <a href='003trace.cc.html#L374'>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="L106" class="LineNr">106 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>size<span class="Delimiter">(),</span> <span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L107" class="LineNr">107 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> <span class="Constant">"abc"</span><span class="Delimiter">);</span> +<span id="L108" class="LineNr">108 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">),</span> <span class="Constant">"def"</span><span class="Delimiter">);</span> +<span id="L109" class="LineNr">109 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>result<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">),</span> <span class="Constant">"ghi"</span><span class="Delimiter">);</span> <span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span> <span id="L111" class="LineNr">111 </span> -<span id="L112" class="LineNr">112 </span><span class="Normal">void</span> test_trim<span class="Delimiter">()</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">" "</span><span class="Delimiter">),</span> <span class="Constant">""</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">" "</span><span class="Delimiter">),</span> <span class="Constant">""</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">" a"</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">" ab"</span><span class="Delimiter">),</span> <span class="Constant">"ab"</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">"a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</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">"ab "</span><span class="Delimiter">),</span> <span class="Constant">"ab"</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">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> -<span id="L124" class="LineNr">124 </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="L125" class="LineNr">125 </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="L112" class="LineNr">112 </span><span class="Normal">void</span> <a href='003trace.test.cc.html#L112'>test_trim</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L113" class="LineNr">113 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>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#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">" "</span><span class="Delimiter">),</span> <span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L115" class="LineNr">115 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">" "</span><span class="Delimiter">),</span> <span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L116" class="LineNr">116 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">"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#L398'>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="L118" class="LineNr">118 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">" 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#L398'>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="L120" class="LineNr">120 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">"a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L121" class="LineNr">121 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">"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#L398'>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="L123" class="LineNr">123 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L124" class="LineNr">124 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">" a "</span><span class="Delimiter">),</span> <span class="Constant">"a"</span><span class="Delimiter">);</span> +<span id="L125" class="LineNr">125 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='003trace.cc.html#L398'>trim</a><span class="Delimiter">(</span><span class="Constant">" ab "</span><span class="Delimiter">),</span> <span class="Constant">"ab"</span><span class="Delimiter">);</span> <span id="L126" class="LineNr">126 </span><span class="Delimiter">}</span> </pre> </body> diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html index c7f94253..4ea1a84c 100644 --- a/html/subx/010---vm.cc.html +++ b/html/subx/010---vm.cc.html @@ -71,33 +71,33 @@ if ('onhashchange' in window) { <span id="L10" class="LineNr"> 10 </span> <span id="L11" class="LineNr"> 11 </span><span class="Delimiter">:(before "End Types")</span> <span id="L12" class="LineNr"> 12 </span><span class="Normal">enum</span> <span class="Delimiter">{</span> -<span id="L13" class="LineNr"> 13 </span> EAX<span class="Delimiter">,</span> -<span id="L14" class="LineNr"> 14 </span> ECX<span class="Delimiter">,</span> -<span id="L15" class="LineNr"> 15 </span> EDX<span class="Delimiter">,</span> -<span id="L16" class="LineNr"> 16 </span> EBX<span class="Delimiter">,</span> -<span id="L17" class="LineNr"> 17 </span> ESP<span class="Delimiter">,</span> -<span id="L18" class="LineNr"> 18 </span> EBP<span class="Delimiter">,</span> -<span id="L19" class="LineNr"> 19 </span> ESI<span class="Delimiter">,</span> -<span id="L20" class="LineNr"> 20 </span> EDI<span class="Delimiter">,</span> -<span id="L21" class="LineNr"> 21 </span> NUM_INT_REGISTERS<span class="Delimiter">,</span> +<span id="L13" class="LineNr"> 13 </span> <a href='010---vm.cc.html#L13'>EAX</a><span class="Delimiter">,</span> +<span id="L14" class="LineNr"> 14 </span> <a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">,</span> +<span id="L15" class="LineNr"> 15 </span> <a href='010---vm.cc.html#L15'>EDX</a><span class="Delimiter">,</span> +<span id="L16" class="LineNr"> 16 </span> <a href='010---vm.cc.html#L16'>EBX</a><span class="Delimiter">,</span> +<span id="L17" class="LineNr"> 17 </span> <a href='010---vm.cc.html#L17'>ESP</a><span class="Delimiter">,</span> +<span id="L18" class="LineNr"> 18 </span> <a href='010---vm.cc.html#L18'>EBP</a><span class="Delimiter">,</span> +<span id="L19" class="LineNr"> 19 </span> <a href='010---vm.cc.html#L19'>ESI</a><span class="Delimiter">,</span> +<span id="L20" class="LineNr"> 20 </span> <a href='010---vm.cc.html#L20'>EDI</a><span class="Delimiter">,</span> +<span id="L21" class="LineNr"> 21 </span> <a href='010---vm.cc.html#L21'>NUM_INT_REGISTERS</a><span class="Delimiter">,</span> <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">};</span> -<span id="L23" class="LineNr"> 23 </span><span class="Normal">union</span> reg <span class="Delimiter">{</span> +<span id="L23" class="LineNr"> 23 </span><span class="Normal">union</span> <a href='010---vm.cc.html#L23'>reg</a> <span class="Delimiter">{</span> <span id="L24" class="LineNr"> 24 </span> <span class="Normal">int32_t</span> i<span class="Delimiter">;</span> <span id="L25" class="LineNr"> 25 </span> <span class="Normal">uint32_t</span> u<span class="Delimiter">;</span> <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">};</span> <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L28" class="LineNr"> 28 </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="L29" class="LineNr"> 29 </span><span class="Normal">uint32_t</span> EIP = <span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// preserve null pointer</span> +<span id="L28" class="LineNr"> 28 </span><a href='010---vm.cc.html#L23'>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="L29" class="LineNr"> 29 </span><span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L29'>EIP</a> = <span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// preserve null pointer</span> <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L31" class="LineNr"> 31 </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="L32" class="LineNr"> 32 </span>EIP = <span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// preserve null pointer</span> +<span id="L31" class="LineNr"> 31 </span>bzero<span class="Delimiter">(</span><a href='010---vm.cc.html#L28'>Reg</a><span class="Delimiter">,</span> <span class="Normal">sizeof</span><span class="Delimiter">(</span><a href='010---vm.cc.html#L28'>Reg</a><span class="Delimiter">));</span> +<span id="L32" class="LineNr"> 32 </span><a href='010---vm.cc.html#L29'>EIP</a> = <span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// preserve null pointer</span> <span id="L33" class="LineNr"> 33 </span> -<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before "End Help Contents")</span> +<span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Contents")</span> <span id="L35" class="LineNr"> 35 </span>cerr << <span class="Constant">" registers</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before "End Help Texts")</span> -<span id="L37" class="LineNr"> 37 </span>put_new<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"registers"</span><span class="Delimiter">,</span> +<span id="L36" class="LineNr"> 36 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Texts")</span> +<span id="L37" class="LineNr"> 37 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"registers"</span><span class="Delimiter">,</span> <span id="L38" class="LineNr"> 38 </span> <span class="Constant">"SubX currently supports eight 32-bit integer registers. From 0 to 7, they are:</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L39" class="LineNr"> 39 </span> <span class="Constant">" EAX ECX EDX EBX ESP EBP ESI EDI</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L39" class="LineNr"> 39 </span> <span class="Constant">" <a href='010---vm.cc.html#L13'>EAX</a> <a href='010---vm.cc.html#L14'>ECX</a> <a href='010---vm.cc.html#L15'>EDX</a> <a href='010---vm.cc.html#L16'>EBX</a> <a href='010---vm.cc.html#L17'>ESP</a> <a href='010---vm.cc.html#L18'>EBP</a> <a href='010---vm.cc.html#L19'>ESI</a> <a href='010---vm.cc.html#L20'>EDI</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L40" class="LineNr"> 40 </span> <span class="Constant">"ESP contains the top of the stack.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L41" class="LineNr"> 41 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L42" class="LineNr"> 42 </span> <span class="Constant">"-- 8-bit registers</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -105,11 +105,11 @@ if ('onhashchange' in window) { <span id="L44" class="LineNr"> 44 </span> <span class="Constant">"From 0 to 7, they are:</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L45" class="LineNr"> 45 </span> <span class="Constant">" AL CL DL BL AH CH DH BH</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L46" class="LineNr"> 46 </span> <span class="Constant">"The 8-bit registers overlap with the 32-bit ones. AL is the lowest signicant byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L47" class="LineNr"> 47 </span> <span class="Constant">"of EAX, AH is the second lowest significant byte, and so on.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L47" class="LineNr"> 47 </span> <span class="Constant">"of <a href='010---vm.cc.html#L13'>EAX</a>, AH is the second lowest significant byte, and so on.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L48" class="LineNr"> 48 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L49" class="LineNr"> 49 </span> <span class="Constant">"For example, if EBX contains 0x11223344, then BL contains 0x44, and BH contains 0x33.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L49" class="LineNr"> 49 </span> <span class="Constant">"For example, if <a href='010---vm.cc.html#L16'>EBX</a> contains 0x11223344, then BL contains 0x44, and BH contains 0x33.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L50" class="LineNr"> 50 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L51" class="LineNr"> 51 </span> <span class="Constant">"There is no way to access bytes within ESP, EBP, ESI or EDI.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L51" class="LineNr"> 51 </span> <span class="Constant">"There is no way to access bytes within <a href='010---vm.cc.html#L17'>ESP</a>, <a href='010---vm.cc.html#L18'>EBP</a>, <a href='010---vm.cc.html#L19'>ESI</a> or EDI.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L52" class="LineNr"> 52 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L53" class="LineNr"> 53 </span> <span class="Constant">"For complete details consult the IA-32 software developer's manual, volume 2,</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L54" class="LineNr"> 54 </span> <span class="Constant">"table 2-2, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing forms with the ModR/M byte</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -121,8 +121,8 @@ if ('onhashchange' in window) { <span id="L60" class="LineNr"> 60 </span> <span class="Constant">"Various instructions (particularly 'compare') modify one or more of three 1-bit 'flag'</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L61" class="LineNr"> 61 </span> <span class="Constant">"registers, as a side-effect:</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L62" class="LineNr"> 62 </span> <span class="Constant">"- the sign flag (SF): usually set if an arithmetic result is negative, or</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L63" class="LineNr"> 63 </span> <span class="Constant">" reset if not.</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L64" class="LineNr"> 64 </span> <span class="Constant">"- the zero flag (ZF): usually set if a result is zero, or reset if not.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L63" class="LineNr"> 63 </span> <span class="Constant">" <a href='000organization.cc.html#L148'>reset</a> if not.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L64" class="LineNr"> 64 </span> <span class="Constant">"- the zero flag (ZF): usually set if a result is zero, or <a href='000organization.cc.html#L148'>reset</a> if not.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L65" class="LineNr"> 65 </span> <span class="Constant">"- the overflow flag (OF): usually set if an arithmetic result overflows.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L66" class="LineNr"> 66 </span> <span class="Constant">"The flag bits are read by conditional jumps.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L67" class="LineNr"> 67 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -139,9 +139,9 @@ if ('onhashchange' in window) { <span id="L78" class="LineNr"> 78 </span><span class="Comment">// the subset of x86 flag registers we care about</span> <span id="L79" class="LineNr"> 79 </span><span class="Normal">bool</span> SF =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// sign flag</span> <span id="L80" class="LineNr"> 80 </span><span class="Normal">bool</span> ZF =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// zero flag</span> -<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> OF =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// overflow flag</span> +<span id="L81" class="LineNr"> 81 </span><span class="Normal">bool</span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// overflow flag</span> <span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L83" class="LineNr"> 83 </span>SF = ZF = OF =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L83" class="LineNr"> 83 </span>SF = ZF = <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L84" class="LineNr"> 84 </span> <span id="L85" class="LineNr"> 85 </span><span class="Comment">//: how the flag registers are updated after each instruction</span> <span id="L86" class="LineNr"> 86 </span> @@ -153,10 +153,10 @@ if ('onhashchange' in window) { <span id="L92" class="LineNr"> 92 </span> <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be signed </span><span class="Comment">*/</span> \ <span id="L93" class="LineNr"> 93 </span> <span class="Normal">int64_t</span> tmp = arg1 op arg2<span class="Delimiter">;</span> \ <span id="L94" class="LineNr"> 94 </span> arg1 = arg1 op arg2<span class="Delimiter">;</span> \ -<span id="L95" class="LineNr"> 95 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << arg1 << end<span class="Delimiter">();</span> \ +<span id="L95" class="LineNr"> 95 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg1 << end<span class="Delimiter">();</span> \ <span id="L96" class="LineNr"> 96 </span> SF = <span class="Delimiter">(</span>arg1 < <span class="Constant">0</span><span class="Delimiter">);</span> \ <span id="L97" class="LineNr"> 97 </span> ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \ -<span id="L98" class="LineNr"> 98 </span> OF = <span class="Delimiter">(</span>arg1 != tmp<span class="Delimiter">);</span> \ +<span id="L98" class="LineNr"> 98 </span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>arg1 != tmp<span class="Delimiter">);</span> \ <span id="L99" class="LineNr"> 99 </span><span class="Delimiter">}</span> <span id="L100" class="LineNr">100 </span> <span id="L101" class="LineNr">101 </span><span class="Comment">// Combine 'arg1' and 'arg2' with bitwise operation 'op' and store the result</span> @@ -164,16 +164,16 @@ if ('onhashchange' in window) { <span id="L103" class="LineNr">103 </span><span class="Comment">#define BINARY_BITWISE_OP(op, arg1, arg2) { \</span> <span id="L104" class="LineNr">104 </span> <span class="Comment">/*</span><span class="Comment"> arg1 and arg2 must be unsigned </span><span class="Comment">*/</span> \ <span id="L105" class="LineNr">105 </span> arg1 = arg1 op arg2<span class="Delimiter">;</span> \ -<span id="L106" class="LineNr">106 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << arg1 << end<span class="Delimiter">();</span> \ +<span id="L106" class="LineNr">106 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg1 << end<span class="Delimiter">();</span> \ <span id="L107" class="LineNr">107 </span> SF = <span class="Delimiter">(</span>arg1 >> <span class="Constant">31</span><span class="Delimiter">);</span> \ <span id="L108" class="LineNr">108 </span> ZF = <span class="Delimiter">(</span>arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> \ -<span id="L109" class="LineNr">109 </span> OF =<span class="Constant"> false</span><span class="Delimiter">;</span> \ +<span id="L109" class="LineNr">109 </span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> \ <span id="L110" class="LineNr">110 </span><span class="Delimiter">}</span> <span id="L111" class="LineNr">111 </span> <span id="L112" class="LineNr">112 </span><span class="SalientComment">//:: simulated RAM</span> <span id="L113" class="LineNr">113 </span> <span id="L114" class="LineNr">114 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> INITIAL_SEGMENT_SIZE = <span class="Constant">0x1000</span> - <span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a> = <span class="Constant">0x1000</span> - <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L116" class="LineNr">116 </span><span class="Comment">// Subtract one just so we can start the first segment at address 1 without</span> <span id="L117" class="LineNr">117 </span><span class="Comment">// overflowing the first segment. Other segments will learn to adjust.</span> <span id="L118" class="LineNr">118 </span> @@ -182,38 +182,38 @@ if ('onhashchange' in window) { <span id="L121" class="LineNr">121 </span><span class="Normal">struct</span> vma <span class="Delimiter">{</span> <span id="L122" class="LineNr">122 </span> <span class="Normal">uint32_t</span> start<span class="Delimiter">;</span> <span class="Comment">// inclusive</span> <span id="L123" class="LineNr">123 </span> <span class="Normal">uint32_t</span> end<span class="Delimiter">;</span> <span class="Comment">// exclusive</span> -<span id="L124" class="LineNr">124 </span> vector<<span class="Normal">uint8_t</span>> _data<span class="Delimiter">;</span> +<span id="L124" class="LineNr">124 </span> vector<<span class="Normal">uint8_t</span>> <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">;</span> <span id="L125" class="LineNr">125 </span> vma<span class="Delimiter">(</span><span class="Normal">uint32_t</span> s<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e<span class="Delimiter">)</span> :start<span class="Delimiter">(</span>s<span class="Delimiter">),</span> end<span class="Delimiter">(</span>e<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L126" class="LineNr">126 </span> _data<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span> +<span id="L126" class="LineNr">126 </span> <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span> <span id="L127" class="LineNr">127 </span> <span class="Delimiter">}</span> <span id="L128" class="LineNr">128 </span> vma<span class="Delimiter">(</span><span class="Normal">uint32_t</span> s<span class="Delimiter">)</span> :start<span class="Delimiter">(</span>s<span class="Delimiter">),</span> end<span class="Delimiter">(</span>s+INITIAL_SEGMENT_SIZE<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L129" class="LineNr">129 </span> _data<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span> +<span id="L129" class="LineNr">129 </span> <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>end-start<span class="Delimiter">);</span> <span id="L130" class="LineNr">130 </span> <span class="Delimiter">}</span> -<span id="L131" class="LineNr">131 </span> <span class="Normal">bool</span> match<span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L131" class="LineNr">131 </span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L132" class="LineNr">132 </span> <span class="Identifier">return</span> a >= start && a < end<span class="Delimiter">;</span> <span id="L133" class="LineNr">133 </span> <span class="Delimiter">}</span> -<span id="L134" class="LineNr">134 </span> <span class="Normal">bool</span> match32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L134" class="LineNr">134 </span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L134'>match32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L135" class="LineNr">135 </span> <span class="Identifier">return</span> a >= start && a+<span class="Constant">4</span> <= end<span class="Delimiter">;</span> <span id="L136" class="LineNr">136 </span> <span class="Delimiter">}</span> <span id="L137" class="LineNr">137 </span> <span class="Normal">uint8_t</span>& data<span class="Delimiter">(</span><span class="Normal">uint32_t</span> a<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L138" class="LineNr">138 </span> assert<span class="Delimiter">(</span>match<span class="Delimiter">(</span>a<span class="Delimiter">));</span> -<span id="L139" class="LineNr">139 </span> <span class="Identifier">return</span> _data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>a-start<span class="Delimiter">);</span> +<span id="L138" class="LineNr">138 </span> assert<span class="Delimiter">(</span><a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span>a<span class="Delimiter">));</span> +<span id="L139" class="LineNr">139 </span> <span class="Identifier">return</span> <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>a-start<span class="Delimiter">);</span> <span id="L140" class="LineNr">140 </span> <span class="Delimiter">}</span> -<span id="L141" class="LineNr">141 </span> <span class="Normal">void</span> grow_until<span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L141" class="LineNr">141 </span> <span class="Normal">void</span> <a href='010---vm.cc.html#L141'>grow_until</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L142" class="LineNr">142 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>new_end_address < end<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L143" class="LineNr">143 </span> <span class="Comment">// Ugly: vma knows about the global Memory list of vmas</span> -<span id="L144" class="LineNr">144 </span> <span class="Normal">void</span> sanity_check<span class="Delimiter">(</span><span class="Normal">uint32_t</span> start<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> end<span class="Delimiter">);</span> -<span id="L145" class="LineNr">145 </span> sanity_check<span class="Delimiter">(</span>start<span class="Delimiter">,</span> new_end_address<span class="Delimiter">);</span> +<span id="L144" class="LineNr">144 </span> <span class="Normal">void</span> <a href='010---vm.cc.html#L152'>sanity_check</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> start<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> end<span class="Delimiter">);</span> +<span id="L145" class="LineNr">145 </span> <a href='010---vm.cc.html#L152'>sanity_check</a><span class="Delimiter">(</span>start<span class="Delimiter">,</span> new_end_address<span class="Delimiter">);</span> <span id="L146" class="LineNr">146 </span> end = new_end_address<span class="Delimiter">;</span> -<span id="L147" class="LineNr">147 </span> _data<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>new_end_address - start<span class="Delimiter">);</span> +<span id="L147" class="LineNr">147 </span> <a href='010---vm.cc.html#L124'>_data</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>new_end_address - start<span class="Delimiter">);</span> <span id="L148" class="LineNr">148 </span> <span class="Delimiter">}</span> <span id="L149" class="LineNr">149 </span> <span class="Comment">// End vma Methods</span> <span id="L150" class="LineNr">150 </span><span class="Delimiter">};</span> <span id="L151" class="LineNr">151 </span><span class="Delimiter">:(code)</span> -<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> sanity_check<span class="Delimiter">(</span><span class="Normal">uint32_t</span> start<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> end<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L152" class="LineNr">152 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L152'>sanity_check</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> start<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> end<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L153" class="LineNr">153 </span> <span class="Normal">bool</span> dup_found =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L154" class="LineNr">154 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>Mem<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L155" class="LineNr">155 </span> <span class="Normal">const</span> vma& curr = Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L154" class="LineNr">154 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L155" class="LineNr">155 </span> <span class="Normal">const</span> vma& curr = <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L156" class="LineNr">156 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == start<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L157" class="LineNr">157 </span> assert<span class="Delimiter">(</span>!dup_found<span class="Delimiter">);</span> <span id="L158" class="LineNr">158 </span> dup_found =<span class="Constant"> true</span><span class="Delimiter">;</span> @@ -229,112 +229,112 @@ if ('onhashchange' in window) { <span id="L168" class="LineNr">168 </span> <span id="L169" class="LineNr">169 </span><span class="Delimiter">:(before "End Globals")</span> <span id="L170" class="LineNr">170 </span><span class="Comment">// RAM is made of VMAs.</span> -<span id="L171" class="LineNr">171 </span>vector<vma> Mem<span class="Delimiter">;</span> +<span id="L171" class="LineNr">171 </span>vector<vma> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">;</span> <span id="L172" class="LineNr">172 </span><span class="Delimiter">:(code)</span> <span id="L173" class="LineNr">173 </span><span class="Comment">// The first 3 VMAs are special. When loading ELF binaries in later layers,</span> <span id="L174" class="LineNr">174 </span><span class="Comment">// we'll assume that the first VMA is for code, the second is for data</span> <span id="L175" class="LineNr">175 </span><span class="Comment">// (including the heap), and the third for the stack.</span> -<span id="L176" class="LineNr">176 </span><span class="Normal">void</span> grow_code_segment<span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L176" class="LineNr">176 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L176'>grow_code_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L177" class="LineNr">177 </span> assert<span class="Delimiter">(</span>!Mem<span class="Delimiter">.</span>empty<span class="Delimiter">());</span> -<span id="L178" class="LineNr">178 </span> Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>grow_until<span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span> +<span id="L178" class="LineNr">178 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L141'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span> <span id="L179" class="LineNr">179 </span><span class="Delimiter">}</span> -<span id="L180" class="LineNr">180 </span><span class="Normal">void</span> grow_data_segment<span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L181" class="LineNr">181 </span> assert<span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>Mem<span class="Delimiter">)</span> > <span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L182" class="LineNr">182 </span> Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>grow_until<span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span> +<span id="L180" class="LineNr">180 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L180'>grow_data_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> new_end_address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L181" class="LineNr">181 </span> assert<span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">)</span> > <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L182" class="LineNr">182 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L141'>grow_until</a><span class="Delimiter">(</span>new_end_address<span class="Delimiter">);</span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span> <span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L185" class="LineNr">185 </span><span class="Normal">uint32_t</span> End_of_program = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// when the program executes past this address in tests we'll stop the test</span> +<span id="L185" class="LineNr">185 </span><span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L185'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span class="Comment">// when the program executes past this address in tests we'll stop the test</span> <span id="L186" class="LineNr">186 </span><span class="Comment">// The stack grows downward. Can't increase its size for now.</span> <span id="L187" class="LineNr">187 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L188" class="LineNr">188 </span>Mem<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L189" class="LineNr">189 </span>End_of_program = <span class="Constant">0</span><span class="Delimiter">;</span> +<span id="L188" class="LineNr">188 </span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L189" class="LineNr">189 </span><a href='010---vm.cc.html#L185'>End_of_program</a> = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L190" class="LineNr">190 </span><span class="Delimiter">:(code)</span> <span id="L191" class="LineNr">191 </span><span class="Comment">// These helpers depend on Mem being laid out contiguously (so you can't use a</span> <span id="L192" class="LineNr">192 </span><span class="Comment">// map, etc.) and on the host also being little-endian.</span> -<span id="L193" class="LineNr">193 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> read_mem_u8<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L194" class="LineNr">194 </span> <span class="Normal">uint8_t</span>* handle = mem_addr_u8<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span class="Comment">// error messages get printed here</span> +<span id="L193" class="LineNr">193 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L194" class="LineNr">194 </span> <span class="Normal">uint8_t</span>* handle = <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span class="Comment">// error messages get printed here</span> <span id="L195" class="LineNr">195 </span> <span class="Identifier">return</span> handle ? *handle : <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L196" class="LineNr">196 </span><span class="Delimiter">}</span> -<span id="L197" class="LineNr">197 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span> read_mem_i8<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L198" class="LineNr">198 </span> <span class="Identifier">return</span> <span class="Normal">static_cast</span><<span class="Normal">int8_t</span>><span class="Delimiter">(</span>read_mem_u8<span class="Delimiter">(</span>addr<span class="Delimiter">));</span> +<span id="L197" class="LineNr">197 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span> <a href='010---vm.cc.html#L197'>read_mem_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L198" class="LineNr">198 </span> <span class="Identifier">return</span> <span class="Normal">static_cast</span><<span class="Normal">int8_t</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span> <span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span> -<span id="L200" class="LineNr">200 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> read_mem_u32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L201" class="LineNr">201 </span> <span class="Normal">uint32_t</span>* handle = mem_addr_u32<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span class="Comment">// error messages get printed here</span> +<span id="L200" class="LineNr">200 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L201" class="LineNr">201 </span> <span class="Normal">uint32_t</span>* handle = <a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span class="Comment">// error messages get printed here</span> <span id="L202" class="LineNr">202 </span> <span class="Identifier">return</span> handle ? *handle : <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L203" class="LineNr">203 </span><span class="Delimiter">}</span> -<span id="L204" class="LineNr">204 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span> read_mem_i32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L205" class="LineNr">205 </span> <span class="Identifier">return</span> <span class="Normal">static_cast</span><<span class="Normal">int32_t</span>><span class="Delimiter">(</span>read_mem_u32<span class="Delimiter">(</span>addr<span class="Delimiter">));</span> +<span id="L204" class="LineNr">204 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span> <a href='010---vm.cc.html#L204'>read_mem_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L205" class="LineNr">205 </span> <span class="Identifier">return</span> <span class="Normal">static_cast</span><<span class="Normal">int32_t</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span> <span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span> <span id="L207" class="LineNr">207 </span> -<span id="L208" class="LineNr">208 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span>* mem_addr_u8<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L208" class="LineNr">208 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span>* <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L209" class="LineNr">209 </span> <span class="Normal">uint8_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L210" class="LineNr">210 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>Mem<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L211" class="LineNr">211 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>match<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L210" class="LineNr">210 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L211" class="LineNr">211 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L212" class="LineNr">212 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> -<span id="L213" class="LineNr">213 </span> raise << <span class="Constant">"address 0x"</span> << HEXWORD << addr << <span class="Constant">" is in two segments</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L213" class="LineNr">213 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L214" class="LineNr">214 </span> result = &Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span id="L215" class="LineNr">215 </span> <span class="Delimiter">}</span> <span id="L216" class="LineNr">216 </span> <span class="Delimiter">}</span> <span id="L217" class="LineNr">217 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span> -<span id="L218" class="LineNr">218 </span> raise << <span class="Constant">"Tried to access uninitialized memory at address 0x"</span> << HEXWORD << addr << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L218" class="LineNr">218 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Tried to access uninitialized memory at address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L219" class="LineNr">219 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span> -<span id="L221" class="LineNr">221 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span>* mem_addr_i8<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L222" class="LineNr">222 </span> <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span><<span class="Normal">int8_t</span>*><span class="Delimiter">(</span>mem_addr_u8<span class="Delimiter">(</span>addr<span class="Delimiter">));</span> +<span id="L221" class="LineNr">221 </span><span class="Normal">inline</span> <span class="Normal">int8_t</span>* <a href='010---vm.cc.html#L221'>mem_addr_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L222" class="LineNr">222 </span> <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span><<span class="Normal">int8_t</span>*><span class="Delimiter">(</span><a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span> <span id="L223" class="LineNr">223 </span><span class="Delimiter">}</span> -<span id="L224" class="LineNr">224 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span>* mem_addr_u32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L224" class="LineNr">224 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span>* <a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L225" class="LineNr">225 </span> <span class="Normal">uint32_t</span>* result = <span class="Constant">NULL</span><span class="Delimiter">;</span> -<span id="L226" class="LineNr">226 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>Mem<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L227" class="LineNr">227 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>match32<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L226" class="LineNr">226 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L227" class="LineNr">227 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L134'>match32</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L228" class="LineNr">228 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> -<span id="L229" class="LineNr">229 </span> raise << <span class="Constant">"address 0x"</span> << HEXWORD << addr << <span class="Constant">" is in two segments</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L229" class="LineNr">229 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L230" class="LineNr">230 </span> result = <span class="Normal">reinterpret_cast</span><<span class="Normal">uint32_t</span>*><span class="Delimiter">(</span>&Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">(</span>addr<span class="Delimiter">));</span> <span id="L231" class="LineNr">231 </span> <span class="Delimiter">}</span> <span id="L232" class="LineNr">232 </span> <span class="Delimiter">}</span> <span id="L233" class="LineNr">233 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result == <span class="Constant">NULL</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L234" class="LineNr">234 </span> raise << <span class="Constant">"Tried to access uninitialized memory at address 0x"</span> << HEXWORD << addr << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> -<span id="L235" class="LineNr">235 </span> raise << <span class="Constant">"The entire 4-byte word should be initialized and lie in a single segment.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L234" class="LineNr">234 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Tried to access uninitialized memory at address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L235" class="LineNr">235 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"The entire 4-byte <a href='011run.cc.html#L123'>word</a> should be initialized and lie in a single segment.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L236" class="LineNr">236 </span> <span class="Delimiter">}</span> <span id="L237" class="LineNr">237 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L238" class="LineNr">238 </span><span class="Delimiter">}</span> -<span id="L239" class="LineNr">239 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span>* mem_addr_i32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L240" class="LineNr">240 </span> <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span><<span class="Normal">int32_t</span>*><span class="Delimiter">(</span>mem_addr_u32<span class="Delimiter">(</span>addr<span class="Delimiter">));</span> +<span id="L239" class="LineNr">239 </span><span class="Normal">inline</span> <span class="Normal">int32_t</span>* <a href='010---vm.cc.html#L239'>mem_addr_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L240" class="LineNr">240 </span> <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span><<span class="Normal">int32_t</span>*><span class="Delimiter">(</span><a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span> <span id="L241" class="LineNr">241 </span><span class="Delimiter">}</span> <span id="L242" class="LineNr">242 </span><span class="Comment">// helper for some syscalls. But read-only.</span> -<span id="L243" class="LineNr">243 </span><span class="Normal">inline</span> <span class="Normal">const</span> <span class="Normal">char</span>* mem_addr_kernel_string<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L244" class="LineNr">244 </span> <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span><<span class="Normal">const</span> <span class="Normal">char</span>*><span class="Delimiter">(</span>mem_addr_u8<span class="Delimiter">(</span>addr<span class="Delimiter">));</span> +<span id="L243" class="LineNr">243 </span><span class="Normal">inline</span> <span class="Normal">const</span> <span class="Normal">char</span>* <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L244" class="LineNr">244 </span> <span class="Identifier">return</span> <span class="Normal">reinterpret_cast</span><<span class="Normal">const</span> <span class="Normal">char</span>*><span class="Delimiter">(</span><a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">));</span> <span id="L245" class="LineNr">245 </span><span class="Delimiter">}</span> -<span id="L246" class="LineNr">246 </span><span class="Normal">inline</span> string mem_addr_string<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L246" class="LineNr">246 </span><span class="Normal">inline</span> string <a href='010---vm.cc.html#L246'>mem_addr_string</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L247" class="LineNr">247 </span> ostringstream out<span class="Delimiter">;</span> <span id="L248" class="LineNr">248 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < size<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> -<span id="L249" class="LineNr">249 </span> out << read_mem_u8<span class="Delimiter">(</span>addr+i<span class="Delimiter">);</span> +<span id="L249" class="LineNr">249 </span> out << <a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>addr+i<span class="Delimiter">);</span> <span id="L250" class="LineNr">250 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L251" class="LineNr">251 </span><span class="Delimiter">}</span> <span id="L252" class="LineNr">252 </span> <span id="L253" class="LineNr">253 </span> -<span id="L254" class="LineNr">254 </span><span class="Normal">inline</span> <span class="Normal">void</span> write_mem_u8<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L255" class="LineNr">255 </span> <span class="Normal">uint8_t</span>* handle = mem_addr_u8<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> +<span id="L254" class="LineNr">254 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L255" class="LineNr">255 </span> <span class="Normal">uint8_t</span>* handle = <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span id="L256" class="LineNr">256 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span> <span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span> -<span id="L258" class="LineNr">258 </span><span class="Normal">inline</span> <span class="Normal">void</span> write_mem_i8<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L259" class="LineNr">259 </span> <span class="Normal">int8_t</span>* handle = mem_addr_i8<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> +<span id="L258" class="LineNr">258 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L258'>write_mem_i8</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L259" class="LineNr">259 </span> <span class="Normal">int8_t</span>* handle = <a href='010---vm.cc.html#L221'>mem_addr_i8</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span id="L260" class="LineNr">260 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span> <span id="L261" class="LineNr">261 </span><span class="Delimiter">}</span> -<span id="L262" class="LineNr">262 </span><span class="Normal">inline</span> <span class="Normal">void</span> write_mem_u32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L263" class="LineNr">263 </span> <span class="Normal">uint32_t</span>* handle = mem_addr_u32<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> +<span id="L262" class="LineNr">262 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L262'>write_mem_u32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L263" class="LineNr">263 </span> <span class="Normal">uint32_t</span>* handle = <a href='010---vm.cc.html#L224'>mem_addr_u32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span id="L264" class="LineNr">264 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span> <span id="L265" class="LineNr">265 </span><span class="Delimiter">}</span> -<span id="L266" class="LineNr">266 </span><span class="Normal">inline</span> <span class="Normal">void</span> write_mem_i32<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L267" class="LineNr">267 </span> <span class="Normal">int32_t</span>* handle = mem_addr_i32<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> +<span id="L266" class="LineNr">266 </span><span class="Normal">inline</span> <span class="Normal">void</span> <a href='010---vm.cc.html#L266'>write_mem_i32</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">,</span> <span class="Normal">int32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L267" class="LineNr">267 </span> <span class="Normal">int32_t</span>* handle = <a href='010---vm.cc.html#L239'>mem_addr_i32</a><span class="Delimiter">(</span>addr<span class="Delimiter">);</span> <span id="L268" class="LineNr">268 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>handle != <span class="Constant">NULL</span><span class="Delimiter">)</span> *handle = val<span class="Delimiter">;</span> <span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span> <span id="L270" class="LineNr">270 </span> -<span id="L271" class="LineNr">271 </span><span class="Normal">inline</span> <span class="Normal">bool</span> already_allocated<span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L271" class="LineNr">271 </span><span class="Normal">inline</span> <span class="Normal">bool</span> <a href='010---vm.cc.html#L271'>already_allocated</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L272" class="LineNr">272 </span> <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L273" class="LineNr">273 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>Mem<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L274" class="LineNr">274 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Mem<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>match<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L273" class="LineNr">273 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L274" class="LineNr">274 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='010---vm.cc.html#L131'>match</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L275" class="LineNr">275 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> -<span id="L276" class="LineNr">276 </span> raise << <span class="Constant">"address 0x"</span> << HEXWORD << addr << <span class="Constant">" is in two segments</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L276" class="LineNr">276 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" is in two <a href='011run.cc.html#L100'>segments</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L277" class="LineNr">277 </span> result =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L278" class="LineNr">278 </span> <span class="Delimiter">}</span> <span id="L279" class="LineNr">279 </span> <span class="Delimiter">}</span> @@ -345,118 +345,118 @@ if ('onhashchange' in window) { <span id="L284" class="LineNr">284 </span> <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(code)</span> <span id="L286" class="LineNr">286 </span><span class="Comment">// skeleton of how x86 instructions are decoded</span> -<span id="L287" class="LineNr">287 </span><span class="Normal">void</span> run_one_instruction<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L287" class="LineNr">287 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L287'>run_one_instruction</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L288" class="LineNr">288 </span> <span class="Normal">uint8_t</span> op=<span class="Constant">0</span><span class="Delimiter">,</span> op2=<span class="Constant">0</span><span class="Delimiter">,</span> op3=<span class="Constant">0</span><span class="Delimiter">;</span> <span id="L289" class="LineNr">289 </span> <span class="Comment">// Run One Instruction</span> -<span id="L290" class="LineNr">290 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"inst: 0x"</span> << HEXWORD << EIP << end<span class="Delimiter">();</span> -<span id="L291" class="LineNr">291 </span> op = next<span class="Delimiter">();</span> -<span id="L292" class="LineNr">292 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Dump_trace<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L293" class="LineNr">293 </span> cerr << <span class="Constant">"opcode: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L290" class="LineNr">290 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"inst: 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << end<span class="Delimiter">();</span> +<span id="L291" class="LineNr">291 </span> op = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> +<span id="L292" class="LineNr">292 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L188'>Dump_trace</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L293" class="LineNr">293 </span> cerr << <span class="Constant">"opcode: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L294" class="LineNr">294 </span> cerr << <span class="Constant">"registers at start: "</span><span class="Delimiter">;</span> -<span id="L295" class="LineNr">295 </span> dump_registers<span class="Delimiter">();</span> +<span id="L295" class="LineNr">295 </span> <a href='010---vm.cc.html#L359'>dump_registers</a><span class="Delimiter">();</span> <span id="L296" class="LineNr">296 </span><span class="CommentedCode">//? dump_stack(); // for debugging; not defined until later layer</span> <span id="L297" class="LineNr">297 </span> <span class="Delimiter">}</span> <span id="L298" class="LineNr">298 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>op<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L299" class="LineNr">299 </span> <span class="Normal">case</span> <span class="Constant">0xf4</span>: <span class="Comment">// hlt</span> -<span id="L300" class="LineNr">300 </span> EIP = End_of_program<span class="Delimiter">;</span> +<span id="L300" class="LineNr">300 </span> <a href='010---vm.cc.html#L29'>EIP</a> = <a href='010---vm.cc.html#L185'>End_of_program</a><span class="Delimiter">;</span> <span id="L301" class="LineNr">301 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L302" class="LineNr">302 </span> <span class="Comment">// End Single-Byte Opcodes</span> <span id="L303" class="LineNr">303 </span> <span class="Normal">case</span> <span class="Constant">0x0f</span>: -<span id="L304" class="LineNr">304 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L304" class="LineNr">304 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L305" class="LineNr">305 </span> <span class="Comment">// End Two-Byte Opcodes Starting With 0f</span> <span id="L306" class="LineNr">306 </span> <span class="Normal">default</span>: -<span id="L307" class="LineNr">307 </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="L308" class="LineNr">308 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L307" class="LineNr">307 </span> cerr << <span class="Constant">"unrecognized second opcode after 0f: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L308" class="LineNr">308 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L309" class="LineNr">309 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L310" class="LineNr">310 </span> <span class="Delimiter">}</span> <span id="L311" class="LineNr">311 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L312" class="LineNr">312 </span> <span class="Normal">case</span> <span class="Constant">0xf2</span>: -<span id="L313" class="LineNr">313 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L313" class="LineNr">313 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L314" class="LineNr">314 </span> <span class="Comment">// End Two-Byte Opcodes Starting With f2</span> <span id="L315" class="LineNr">315 </span> <span class="Normal">case</span> <span class="Constant">0x0f</span>: -<span id="L316" class="LineNr">316 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L316" class="LineNr">316 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L317" class="LineNr">317 </span> <span class="Comment">// End Three-Byte Opcodes Starting With f2 0f</span> <span id="L318" class="LineNr">318 </span> <span class="Normal">default</span>: -<span id="L319" class="LineNr">319 </span> cerr << <span class="Constant">"unrecognized third opcode after f2 0f: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op3<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L320" class="LineNr">320 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L319" class="LineNr">319 </span> cerr << <span class="Constant">"unrecognized third opcode after f2 0f: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L320" class="LineNr">320 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L321" class="LineNr">321 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L322" class="LineNr">322 </span> <span class="Delimiter">}</span> <span id="L323" class="LineNr">323 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L324" class="LineNr">324 </span> <span class="Normal">default</span>: -<span id="L325" class="LineNr">325 </span> cerr << <span class="Constant">"unrecognized second opcode after f2: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L326" class="LineNr">326 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L325" class="LineNr">325 </span> cerr << <span class="Constant">"unrecognized second opcode after f2: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L326" class="LineNr">326 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L327" class="LineNr">327 </span> exit<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 class="Identifier">break</span><span class="Delimiter">;</span> <span id="L330" class="LineNr">330 </span> <span class="Normal">case</span> <span class="Constant">0xf3</span>: -<span id="L331" class="LineNr">331 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L331" class="LineNr">331 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op2 = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L332" class="LineNr">332 </span> <span class="Comment">// End Two-Byte Opcodes Starting With f3</span> <span id="L333" class="LineNr">333 </span> <span class="Normal">case</span> <span class="Constant">0x0f</span>: -<span id="L334" class="LineNr">334 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = next<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L334" class="LineNr">334 </span> <span class="Normal">switch</span><span class="Delimiter">(</span>op3 = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L335" class="LineNr">335 </span> <span class="Comment">// End Three-Byte Opcodes Starting With f3 0f</span> <span id="L336" class="LineNr">336 </span> <span class="Normal">default</span>: -<span id="L337" class="LineNr">337 </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="L338" class="LineNr">338 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L337" class="LineNr">337 </span> cerr << <span class="Constant">"unrecognized third opcode after f3 0f: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op3<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L338" class="LineNr">338 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L339" class="LineNr">339 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L340" class="LineNr">340 </span> <span class="Delimiter">}</span> <span id="L341" class="LineNr">341 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L342" class="LineNr">342 </span> <span class="Normal">default</span>: -<span id="L343" class="LineNr">343 </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="L344" class="LineNr">344 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L343" class="LineNr">343 </span> cerr << <span class="Constant">"unrecognized second opcode after f3: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op2<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L344" class="LineNr">344 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L345" class="LineNr">345 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L346" class="LineNr">346 </span> <span class="Delimiter">}</span> <span id="L347" class="LineNr">347 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L348" class="LineNr">348 </span> <span class="Normal">default</span>: -<span id="L349" class="LineNr">349 </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="L350" class="LineNr">350 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L349" class="LineNr">349 </span> cerr << <span class="Constant">"unrecognized opcode: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L350" class="LineNr">350 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L351" class="LineNr">351 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L352" class="LineNr">352 </span> <span class="Delimiter">}</span> <span id="L353" class="LineNr">353 </span><span class="Delimiter">}</span> <span id="L354" class="LineNr">354 </span> -<span id="L355" class="LineNr">355 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> next<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L356" class="LineNr">356 </span> <span class="Identifier">return</span> read_mem_u8<span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span> +<span id="L355" class="LineNr">355 </span><span class="Normal">inline</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L356" class="LineNr">356 </span> <span class="Identifier">return</span> <a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>EIP++<span class="Delimiter">);</span> <span id="L357" class="LineNr">357 </span><span class="Delimiter">}</span> <span id="L358" class="LineNr">358 </span> -<span id="L359" class="LineNr">359 </span><span class="Normal">void</span> dump_registers<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L360" class="LineNr">360 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < NUM_INT_REGISTERS<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L359" class="LineNr">359 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L359'>dump_registers</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L360" class="LineNr">360 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='010---vm.cc.html#L21'>NUM_INT_REGISTERS</a><span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L361" class="LineNr">361 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> cerr << <span class="Constant">"; "</span><span class="Delimiter">;</span> <span id="L362" class="LineNr">362 </span> cerr << <span class="Constant">" "</span> << i << <span class="Constant">": "</span> << std::hex << std::setw<span class="Delimiter">(</span><span class="Constant">8</span><span class="Delimiter">)</span> << std::setfill<span class="Delimiter">(</span><span class="Constant">'_'</span><span class="Delimiter">)</span> << Reg[i]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> <span id="L363" class="LineNr">363 </span> <span class="Delimiter">}</span> -<span id="L364" class="LineNr">364 </span> cerr << <span class="Constant">" -- SF: "</span> << SF << <span class="Constant">"; ZF: "</span> << ZF << <span class="Constant">"; OF: "</span> << OF << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L364" class="LineNr">364 </span> cerr << <span class="Constant">" -- SF: "</span> << SF << <span class="Constant">"; ZF: "</span> << ZF << <span class="Constant">"; <a href='010---vm.cc.html#L81'>OF</a>: "</span> << <a href='010---vm.cc.html#L81'>OF</a> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span> <span id="L366" class="LineNr">366 </span> <span id="L367" class="LineNr">367 </span><span class="Comment">//: start tracking supported opcodes</span> <span id="L368" class="LineNr">368 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L369" class="LineNr">369 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> Name<span class="Delimiter">;</span> -<span id="L370" class="LineNr">370 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> Name_0f<span class="Delimiter">;</span> -<span id="L371" class="LineNr">371 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> Name_f3<span class="Delimiter">;</span> -<span id="L372" class="LineNr">372 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> Name_f3_0f<span class="Delimiter">;</span> +<span id="L369" class="LineNr">369 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> <a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">;</span> +<span id="L370" class="LineNr">370 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> <a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">;</span> +<span id="L371" class="LineNr">371 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> <a href='010---vm.cc.html#L371'>Name_f3</a><span class="Delimiter">;</span> +<span id="L372" class="LineNr">372 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> string> <a href='010---vm.cc.html#L372'>Name_f3_0f</a><span class="Delimiter">;</span> <span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L374" class="LineNr">374 </span>init_op_names<span class="Delimiter">();</span> +<span id="L374" class="LineNr">374 </span><a href='010---vm.cc.html#L376'>init_op_names</a><span class="Delimiter">();</span> <span id="L375" class="LineNr">375 </span><span class="Delimiter">:(code)</span> -<span id="L376" class="LineNr">376 </span><span class="Normal">void</span> init_op_names<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L377" class="LineNr">377 </span> put<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"f4"</span><span class="Delimiter">,</span> <span class="Constant">"halt (hlt)"</span><span class="Delimiter">);</span> +<span id="L376" class="LineNr">376 </span><span class="Normal">void</span> <a href='010---vm.cc.html#L376'>init_op_names</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L377" class="LineNr">377 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"f4"</span><span class="Delimiter">,</span> <span class="Constant">"halt (hlt)"</span><span class="Delimiter">);</span> <span id="L378" class="LineNr">378 </span> <span class="Comment">// End Initialize Op Names</span> <span id="L379" class="LineNr">379 </span><span class="Delimiter">}</span> <span id="L380" class="LineNr">380 </span> -<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(before "End Help Special-cases(key)")</span> +<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Special-cases(key)")</span> <span id="L382" class="LineNr">382 </span><span class="Normal">if</span> <span class="Delimiter">(</span>key == <span class="Constant">"opcodes"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L383" class="LineNr">383 </span> cerr << <span class="Constant">"Opcodes currently supported by SubX:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L384" class="LineNr">384 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = Name<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Name<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> +<span id="L384" class="LineNr">384 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = <a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span id="L385" class="LineNr">385 </span> cerr << <span class="Constant">" "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << p<span class="Delimiter">-></span>second << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L386" class="LineNr">386 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = Name_0f<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Name_0f<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> +<span id="L386" class="LineNr">386 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = <a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span id="L387" class="LineNr">387 </span> cerr << <span class="Constant">" 0f "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << p<span class="Delimiter">-></span>second << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L388" class="LineNr">388 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = Name_f3<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Name_f3<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> +<span id="L388" class="LineNr">388 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = <a href='010---vm.cc.html#L371'>Name_f3</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='010---vm.cc.html#L371'>Name_f3</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span id="L389" class="LineNr">389 </span> cerr << <span class="Constant">" f3 "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << p<span class="Delimiter">-></span>second << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L390" class="LineNr">390 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = Name_f3_0f<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Name_f3_0f<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> +<span id="L390" class="LineNr">390 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> string>::iterator p = <a href='010---vm.cc.html#L372'>Name_f3_0f</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='010---vm.cc.html#L372'>Name_f3_0f</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span id="L391" class="LineNr">391 </span> cerr << <span class="Constant">" f3 0f "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << p<span class="Delimiter">-></span>second << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L392" class="LineNr">392 </span> cerr << <span class="Constant">"Run `subx help instructions` for details on words like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L392" class="LineNr">392 </span> cerr << <span class="Constant">"Run `subx help instructions` for details on <a href='011run.cc.html#L118'>words</a> like 'r32' and 'disp8'.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L393" class="LineNr">393 </span> <span class="Constant">"For complete details on these instructions, consult the IA-32 manual (volume 2).</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L394" class="LineNr">394 </span> <span class="Constant">"There's various versions of it online, such as <a href="https://c9x.me/x86">https://c9x.me/x86</a>.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L395" class="LineNr">395 </span> <span class="Constant">"The mnemonics in brackets will help you locate each instruction.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L396" class="LineNr">396 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span> -<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before "End Help Contents")</span> +<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Contents")</span> <span id="L399" class="LineNr">399 </span>cerr << <span class="Constant">" opcodes</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L400" class="LineNr">400 </span> <span id="L401" class="LineNr">401 </span><span class="Delimiter">:(before "End Includes")</span> diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html index 97b45613..f1137805 100644 --- a/html/subx/011run.cc.html +++ b/html/subx/011run.cc.html @@ -66,16 +66,16 @@ if ('onhashchange' in window) { <span id="L3" class="LineNr"> 3 </span><span class="Comment">//: (Not to be confused with the 'run' subcommand for running ELF binaries on</span> <span id="L4" class="LineNr"> 4 </span><span class="Comment">//: the VM. That comes later.)</span> <span id="L5" class="LineNr"> 5 </span> -<span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(before "End Help Texts")</span> -<span id="L7" class="LineNr"> 7 </span>put_new<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"syntax"</span><span class="Delimiter">,</span> -<span id="L8" class="LineNr"> 8 </span> <span class="Constant">"SubX programs consist of segments, each segment in turn consisting of lines.</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L9" class="LineNr"> 9 </span> <span class="Constant">"Line-endings are significant; each line should contain a single</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Texts")</span> +<span id="L7" class="LineNr"> 7 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"syntax"</span><span class="Delimiter">,</span> +<span id="L8" class="LineNr"> 8 </span> <span class="Constant">"SubX programs consist of <a href='011run.cc.html#L100'>segments</a>, each segment in turn consisting of lines.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L9" class="LineNr"> 9 </span> <span class="Constant">"Line-endings are significant; each <a href='011run.cc.html#L117'>line</a> should contain a single</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L10" class="LineNr"> 10 </span> <span class="Constant">"instruction, macro or directive.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L11" class="LineNr"> 11 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L12" class="LineNr"> 12 </span> <span class="Constant">"Comments start with the '#' character. It should be at the start of a word</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L13" class="LineNr"> 13 </span> <span class="Constant">"(start of line, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L12" class="LineNr"> 12 </span> <span class="Constant">"Comments start with the '#' character. It should be at the start of a <a href='011run.cc.html#L123'>word</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L13" class="LineNr"> 13 </span> <span class="Constant">"(start of <a href='011run.cc.html#L117'>line</a>, or following a space).</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L14" class="LineNr"> 14 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L15" class="LineNr"> 15 </span> <span class="Constant">"Each segment starts with a header line: a '==' delimiter followed by the name of</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L15" class="LineNr"> 15 </span> <span class="Constant">"Each segment starts with a header <a href='011run.cc.html#L117'>line</a>: a '==' delimiter followed by the name of</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L16" class="LineNr"> 16 </span> <span class="Constant">"the segment.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L17" class="LineNr"> 17 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L18" class="LineNr"> 18 </span> <span class="Constant">"Currently SubX assumes the first segment encountered contains executable <a href='031check_operands.cc.html#L11'>code</a>, and</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -86,8 +86,8 @@ if ('onhashchange' in window) { <span id="L23" class="LineNr"> 23 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L24" class="LineNr"> 24 </span> <span class="Constant">"Segments with the same name get merged together. This rule helps keep functions and</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L25" class="LineNr"> 25 </span> <span class="Constant">"their data close together in .subx files.</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L26" class="LineNr"> 26 </span> <span class="Constant">"Later segments with the same name get their contents *prepended* to earlier ones.</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L27" class="LineNr"> 27 </span> <span class="Constant">"This rule helps each .subx file to put forth a different entrypoint for the binary,</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L26" class="LineNr"> 26 </span> <span class="Constant">"Later <a href='011run.cc.html#L100'>segments</a> with the same name get their <a href='003trace.cc.html#L74'>contents</a> *prepended* to earlier ones.</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L27" class="LineNr"> 27 </span> <span class="Constant">"This rule helps each .subx file to <a href='001help.cc.html#L243'>put</a> forth a different entrypoint for the binary,</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L28" class="LineNr"> 28 </span> <span class="Constant">"overriding previously loaded files.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L29" class="LineNr"> 29 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L30" class="LineNr"> 30 </span> <span class="Constant">"Lines consist of a series of words. Words can contain arbitrary metadata</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -98,7 +98,7 @@ if ('onhashchange' in window) { <span id="L35" class="LineNr"> 35 </span> <span class="Constant">"Programming in machine <a href='031check_operands.cc.html#L11'>code</a> can be annoying, but let's see if we can make</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L36" class="LineNr"> 36 </span> <span class="Constant">"it nice enough to be able to write a compiler in it.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">);</span> -<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before "End Help Contents")</span> +<span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Contents")</span> <span id="L39" class="LineNr"> 39 </span>cerr << <span class="Constant">" syntax</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L40" class="LineNr"> 40 </span> <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(scenario add_imm32_to_eax)</span> @@ -137,30 +137,30 @@ if ('onhashchange' in window) { <span id="L74" class="LineNr"> 74 </span><span class="traceContains">+load: 0x00000003 -> 0b</span> <span id="L75" class="LineNr"> 75 </span><span class="traceContains">+load: 0x00000004 -> 0c</span> <span id="L76" class="LineNr"> 76 </span><span class="traceContains">+load: 0x00000005 -> 0d</span> -<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to reg EAX</span> +<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L78" class="LineNr"> 78 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span> <span id="L79" class="LineNr"> 79 </span> <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(code)</span> <span id="L81" class="LineNr"> 81 </span><span class="Comment">// top-level helper for scenarios: parse the input, transform any macros, load</span> <span id="L82" class="LineNr"> 82 </span><span class="Comment">// the final hex bytes into memory, run it</span> -<span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span> program p<span class="Delimiter">;</span> +<span id="L83" class="LineNr"> 83 </span><span class="Normal">void</span> <a href='011run.cc.html#L83'>run</a><span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L84" class="LineNr"> 84 </span> <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span> <span id="L85" class="LineNr"> 85 </span> istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span> <span id="L86" class="LineNr"> 86 </span> parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span> -<span id="L87" class="LineNr"> 87 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// if any stage raises errors, stop immediately</span> -<span id="L88" class="LineNr"> 88 </span> transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span> -<span id="L89" class="LineNr"> 89 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L90" class="LineNr"> 90 </span> load<span class="Delimiter">(</span>p<span class="Delimiter">);</span> -<span id="L91" class="LineNr"> 91 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L92" class="LineNr"> 92 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>EIP < End_of_program<span class="Delimiter">)</span> -<span id="L93" class="LineNr"> 93 </span> run_one_instruction<span class="Delimiter">();</span> +<span id="L87" class="LineNr"> 87 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// if any stage raises errors, stop immediately</span> +<span id="L88" class="LineNr"> 88 </span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span> +<span id="L89" class="LineNr"> 89 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L90" class="LineNr"> 90 </span> <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span> +<span id="L91" class="LineNr"> 91 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L92" class="LineNr"> 92 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> < <a href='010---vm.cc.html#L185'>End_of_program</a><span class="Delimiter">)</span> +<span id="L93" class="LineNr"> 93 </span> <a href='010---vm.cc.html#L287'>run_one_instruction</a><span class="Delimiter">();</span> <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span> <span id="L95" class="LineNr"> 95 </span> <span id="L96" class="LineNr"> 96 </span><span class="SalientComment">//:: core data structures</span> <span id="L97" class="LineNr"> 97 </span> <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L99" class="LineNr"> 99 </span><span class="Normal">struct</span> program <span class="Delimiter">{</span> -<span id="L100" class="LineNr">100 </span> vector<segment> segments<span class="Delimiter">;</span> +<span id="L99" class="LineNr"> 99 </span><span class="Normal">struct</span> <a href='011run.cc.html#L99'>program</a> <span class="Delimiter">{</span> +<span id="L100" class="LineNr">100 </span> vector<segment> <a href='011run.cc.html#L100'>segments</a><span class="Delimiter">;</span> <span id="L101" class="LineNr">101 </span> <span class="Comment">// random ideas for other things we may eventually need</span> <span id="L102" class="LineNr">102 </span> <span class="Comment">//map<name, address> globals;</span> <span id="L103" class="LineNr">103 </span> <span class="Comment">//vector<recipe> recipes;</span> @@ -169,7 +169,7 @@ if ('onhashchange' in window) { <span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before "struct program")</span> <span id="L107" class="LineNr">107 </span><span class="Normal">struct</span> segment <span class="Delimiter">{</span> <span id="L108" class="LineNr">108 </span> <span class="Normal">uint32_t</span> start<span class="Delimiter">;</span> -<span id="L109" class="LineNr">109 </span> vector<line> lines<span class="Delimiter">;</span> +<span id="L109" class="LineNr">109 </span> vector<line> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span> <span id="L110" class="LineNr">110 </span> <span class="Comment">// End segment Fields</span> <span id="L111" class="LineNr">111 </span> segment<span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L112" class="LineNr">112 </span> start = <span class="Constant">0</span><span class="Delimiter">;</span> @@ -177,13 +177,13 @@ if ('onhashchange' in window) { <span id="L114" class="LineNr">114 </span> <span class="Delimiter">}</span> <span id="L115" class="LineNr">115 </span><span class="Delimiter">};</span> <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before "struct segment")</span> -<span id="L117" class="LineNr">117 </span><span class="Normal">struct</span> line <span class="Delimiter">{</span> -<span id="L118" class="LineNr">118 </span> vector<word> words<span class="Delimiter">;</span> +<span id="L117" class="LineNr">117 </span><span class="Normal">struct</span> <a href='011run.cc.html#L117'>line</a> <span class="Delimiter">{</span> +<span id="L118" class="LineNr">118 </span> vector<word> <a href='011run.cc.html#L118'>words</a><span class="Delimiter">;</span> <span id="L119" class="LineNr">119 </span> vector<string> metadata<span class="Delimiter">;</span> <span id="L120" class="LineNr">120 </span> string original<span class="Delimiter">;</span> <span id="L121" class="LineNr">121 </span><span class="Delimiter">};</span> <span id="L122" class="LineNr">122 </span><span class="Delimiter">:(before "struct line")</span> -<span id="L123" class="LineNr">123 </span><span class="Normal">struct</span> word <span class="Delimiter">{</span> +<span id="L123" class="LineNr">123 </span><span class="Normal">struct</span> <a href='011run.cc.html#L123'>word</a> <span class="Delimiter">{</span> <span id="L124" class="LineNr">124 </span> string original<span class="Delimiter">;</span> <span id="L125" class="LineNr">125 </span> string data<span class="Delimiter">;</span> <span id="L126" class="LineNr">126 </span> vector<string> metadata<span class="Delimiter">;</span> @@ -194,32 +194,32 @@ if ('onhashchange' in window) { <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(code)</span> <span id="L132" class="LineNr">132 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span>istream& fin<span class="Delimiter">,</span> program& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L133" class="LineNr">133 </span> vector<line> l<span class="Delimiter">;</span> -<span id="L134" class="LineNr">134 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"begin"</span> << end<span class="Delimiter">();</span> -<span id="L135" class="LineNr">135 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L134" class="LineNr">134 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"begin"</span> << end<span class="Delimiter">();</span> +<span id="L135" class="LineNr">135 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L136" class="LineNr">136 </span> string line_data<span class="Delimiter">;</span> -<span id="L137" class="LineNr">137 </span> line curr<span class="Delimiter">;</span> +<span id="L137" class="LineNr">137 </span> <a href='011run.cc.html#L117'>line</a> curr<span class="Delimiter">;</span> <span id="L138" class="LineNr">138 </span> getline<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> line_data<span class="Delimiter">);</span> <span id="L139" class="LineNr">139 </span> curr<span class="Delimiter">.</span>original = line_data<span class="Delimiter">;</span> -<span id="L140" class="LineNr">140 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"line: "</span> << line_data << end<span class="Delimiter">();</span> +<span id="L140" class="LineNr">140 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"line: "</span> << line_data << end<span class="Delimiter">();</span> <span id="L141" class="LineNr">141 </span> <span class="Comment">// End Line Parsing Special-cases(line_data -> l)</span> <span id="L142" class="LineNr">142 </span> istringstream lin<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span> -<span id="L143" class="LineNr">143 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L143" class="LineNr">143 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>lin<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L144" class="LineNr">144 </span> string word_data<span class="Delimiter">;</span> <span id="L145" class="LineNr">145 </span> lin >> word_data<span class="Delimiter">;</span> <span id="L146" class="LineNr">146 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>word_data<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L147" class="LineNr">147 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>word_data[<span class="Constant">0</span>] == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Comment">// comment</span> <span id="L148" class="LineNr">148 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">"."</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// comment token</span> <span id="L149" class="LineNr">149 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>word_data == <span class="Constant">"=="</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L150" class="LineNr">150 </span> flush<span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span> +<span id="L150" class="LineNr">150 </span> <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span> <span id="L151" class="LineNr">151 </span> string segment_title<span class="Delimiter">;</span> <span id="L152" class="LineNr">152 </span> lin >> segment_title<span class="Delimiter">;</span> -<span id="L153" class="LineNr">153 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>starts_with<span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">"0x"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L153" class="LineNr">153 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">"0x"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L154" class="LineNr">154 </span> segment s<span class="Delimiter">;</span> -<span id="L155" class="LineNr">155 </span> s<span class="Delimiter">.</span>start = parse_int<span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span> -<span id="L156" class="LineNr">156 </span> sanity_check_program_segment<span class="Delimiter">(</span>out<span class="Delimiter">,</span> s<span class="Delimiter">.</span>start<span class="Delimiter">);</span> -<span id="L157" class="LineNr">157 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L158" class="LineNr">158 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"new segment from 0x"</span> << HEXWORD << s<span class="Delimiter">.</span>start << end<span class="Delimiter">();</span> -<span id="L159" class="LineNr">159 </span> out<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span> +<span id="L155" class="LineNr">155 </span> s<span class="Delimiter">.</span>start = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>segment_title<span class="Delimiter">);</span> +<span id="L156" class="LineNr">156 </span> <a href='011run.cc.html#L201'>sanity_check_program_segment</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> s<span class="Delimiter">.</span>start<span class="Delimiter">);</span> +<span id="L157" class="LineNr">157 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L158" class="LineNr">158 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"new segment from 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << s<span class="Delimiter">.</span>start << end<span class="Delimiter">();</span> +<span id="L159" class="LineNr">159 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>s<span class="Delimiter">);</span> <span id="L160" class="LineNr">160 </span> <span class="Delimiter">}</span> <span id="L161" class="LineNr">161 </span> <span class="Comment">// End Segment Parsing Special-cases(segment_title)</span> <span id="L162" class="LineNr">162 </span> <span class="Comment">// todo: segment segment metadata</span> @@ -229,29 +229,29 @@ if ('onhashchange' in window) { <span id="L166" class="LineNr">166 </span> <span class="Comment">// todo: line metadata</span> <span id="L167" class="LineNr">167 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L168" class="LineNr">168 </span> <span class="Delimiter">}</span> -<span id="L169" class="LineNr">169 </span> curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">());</span> -<span id="L170" class="LineNr">170 </span> parse_word<span class="Delimiter">(</span>word_data<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">());</span> -<span id="L171" class="LineNr">171 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"word: "</span> << to_string<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">());</span> +<span id="L169" class="LineNr">169 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> +<span id="L170" class="LineNr">170 </span> <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>word_data<span class="Delimiter">,</span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span> +<span id="L171" class="LineNr">171 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"word: "</span> << to_string<span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span> <span id="L172" class="LineNr">172 </span> <span class="Delimiter">}</span> -<span id="L173" class="LineNr">173 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> +<span id="L173" class="LineNr">173 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span id="L174" class="LineNr">174 </span> l<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> <span id="L175" class="LineNr">175 </span> <span class="Delimiter">}</span> -<span id="L176" class="LineNr">176 </span> flush<span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span> -<span id="L177" class="LineNr">177 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"done"</span> << end<span class="Delimiter">();</span> +<span id="L176" class="LineNr">176 </span> <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> l<span class="Delimiter">);</span> +<span id="L177" class="LineNr">177 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"done"</span> << end<span class="Delimiter">();</span> <span id="L178" class="LineNr">178 </span><span class="Delimiter">}</span> <span id="L179" class="LineNr">179 </span> -<span id="L180" class="LineNr">180 </span><span class="Normal">void</span> flush<span class="Delimiter">(</span>program& p<span class="Delimiter">,</span> vector<line>& lines<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L181" class="LineNr">181 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>lines<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L182" class="LineNr">182 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L183" class="LineNr">183 </span> raise << <span class="Constant">"input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L180" class="LineNr">180 </span><span class="Normal">void</span> <a href='011run.cc.html#L180'>flush</a><span class="Delimiter">(</span>program& p<span class="Delimiter">,</span> vector<line>& <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L181" class="LineNr">181 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L182" class="LineNr">182 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L183" class="LineNr">183 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L184" class="LineNr">184 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L185" class="LineNr">185 </span> <span class="Delimiter">}</span> <span id="L186" class="LineNr">186 </span> <span class="Comment">// End flush(p, lines) Special-cases</span> -<span id="L187" class="LineNr">187 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"flushing to segment"</span> << end<span class="Delimiter">();</span> -<span id="L188" class="LineNr">188 </span> p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>back<span class="Delimiter">().</span>lines<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>lines<span class="Delimiter">);</span> +<span id="L187" class="LineNr">187 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"flushing to segment"</span> << end<span class="Delimiter">();</span> +<span id="L188" class="LineNr">188 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> <span id="L189" class="LineNr">189 </span><span class="Delimiter">}</span> <span id="L190" class="LineNr">190 </span> -<span id="L191" class="LineNr">191 </span><span class="Normal">void</span> parse_word<span class="Delimiter">(</span><span class="Normal">const</span> string& data<span class="Delimiter">,</span> word& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L191" class="LineNr">191 </span><span class="Normal">void</span> <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span><span class="Normal">const</span> string& data<span class="Delimiter">,</span> word& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L192" class="LineNr">192 </span> out<span class="Delimiter">.</span>original = data<span class="Delimiter">;</span> <span id="L193" class="LineNr">193 </span> istringstream win<span class="Delimiter">(</span>data<span class="Delimiter">);</span> <span id="L194" class="LineNr">194 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>getline<span class="Delimiter">(</span>win<span class="Delimiter">,</span> out<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">'/'</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> @@ -261,16 +261,16 @@ if ('onhashchange' in window) { <span id="L198" class="LineNr">198 </span> <span class="Delimiter">}</span> <span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span> <span id="L200" class="LineNr">200 </span> -<span id="L201" class="LineNr">201 </span><span class="Normal">void</span> sanity_check_program_segment<span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L202" class="LineNr">202 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L203" class="LineNr">203 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start == addr<span class="Delimiter">)</span> -<span id="L204" class="LineNr">204 </span> raise << <span class="Constant">"can't have multiple segments starting at address 0x"</span> << HEXWORD << addr << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L201" class="LineNr">201 </span><span class="Normal">void</span> <a href='011run.cc.html#L201'>sanity_check_program_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> addr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L202" class="LineNr">202 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L203" class="LineNr">203 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start == addr<span class="Delimiter">)</span> +<span id="L204" class="LineNr">204 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"can't have multiple segments starting at address 0x"</span> << HEXWORD << addr << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L205" class="LineNr">205 </span> <span class="Delimiter">}</span> <span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span> <span id="L207" class="LineNr">207 </span> <span id="L208" class="LineNr">208 </span><span class="Comment">// helper for tests</span> <span id="L209" class="LineNr">209 </span><span class="Normal">void</span> parse<span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L210" class="LineNr">210 </span> program p<span class="Delimiter">;</span> +<span id="L210" class="LineNr">210 </span> <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span> <span id="L211" class="LineNr">211 </span> istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span> <span id="L212" class="LineNr">212 </span> parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span> <span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span> @@ -289,60 +289,60 @@ if ('onhashchange' in window) { <span id="L226" class="LineNr">226 </span><span class="Delimiter">:(before "End Types")</span> <span id="L227" class="LineNr">227 </span><span class="Normal">typedef</span> <span class="Normal">void</span> <span class="Delimiter">(</span>*transform_fn<span class="Delimiter">)(</span>program&<span class="Delimiter">);</span> <span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L229" class="LineNr">229 </span>vector<transform_fn> Transform<span class="Delimiter">;</span> +<span id="L229" class="LineNr">229 </span>vector<transform_fn> <a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">;</span> <span id="L230" class="LineNr">230 </span> -<span id="L231" class="LineNr">231 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L232" class="LineNr">232 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"begin"</span> << end<span class="Delimiter">();</span> -<span id="L233" class="LineNr">233 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span> t < SIZE<span class="Delimiter">(</span>Transform<span class="Delimiter">);</span> ++t<span class="Delimiter">)</span> +<span id="L231" class="LineNr">231 </span><span class="Normal">void</span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L232" class="LineNr">232 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"begin"</span> << end<span class="Delimiter">();</span> +<span id="L233" class="LineNr">233 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> t = <span class="Constant">0</span><span class="Delimiter">;</span> t < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">);</span> ++t<span class="Delimiter">)</span> <span id="L234" class="LineNr">234 </span> <span class="Delimiter">(</span>*Transform<span class="Delimiter">.</span>at<span class="Delimiter">(</span>t<span class="Delimiter">))(</span>p<span class="Delimiter">);</span> -<span id="L235" class="LineNr">235 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"done"</span> << end<span class="Delimiter">();</span> +<span id="L235" class="LineNr">235 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"done"</span> << end<span class="Delimiter">();</span> <span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span> <span id="L237" class="LineNr">237 </span> <span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: load</span> <span id="L239" class="LineNr">239 </span> -<span id="L240" class="LineNr">240 </span><span class="Normal">void</span> load<span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L241" class="LineNr">241 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"begin"</span> << end<span class="Delimiter">();</span> -<span id="L242" class="LineNr">242 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L243" class="LineNr">243 </span> raise << <span class="Constant">"no <a href='031check_operands.cc.html#L11'>code</a> to run</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L240" class="LineNr">240 </span><span class="Normal">void</span> <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L241" class="LineNr">241 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"begin"</span> << end<span class="Delimiter">();</span> +<span id="L242" class="LineNr">242 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L243" class="LineNr">243 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"no <a href='031check_operands.cc.html#L11'>code</a> to <a href='011run.cc.html#L83'>run</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L244" class="LineNr">244 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L245" class="LineNr">245 </span> <span class="Delimiter">}</span> <span id="L246" class="LineNr">246 </span> <span class="Comment">// Ensure segments are disjoint.</span> <span id="L247" class="LineNr">247 </span> set<<span class="Normal">uint32_t</span>> overlap<span class="Delimiter">;</span> -<span id="L248" class="LineNr">248 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L249" class="LineNr">249 </span> <span class="Normal">const</span> segment& seg = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L248" class="LineNr">248 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L249" class="LineNr">249 </span> <span class="Normal">const</span> segment& seg = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L250" class="LineNr">250 </span> <span class="Normal">uint32_t</span> addr = seg<span class="Delimiter">.</span>start<span class="Delimiter">;</span> <span id="L251" class="LineNr">251 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!already_allocated<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> -<span id="L252" class="LineNr">252 </span> Mem<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>seg<span class="Delimiter">.</span>start<span class="Delimiter">));</span> -<span id="L253" class="LineNr">253 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"loading segment "</span> << i << <span class="Constant">" from "</span> << HEXWORD << addr << end<span class="Delimiter">();</span> -<span id="L254" class="LineNr">254 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>seg<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L255" class="LineNr">255 </span> <span class="Normal">const</span> line& l = seg<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> -<span id="L256" class="LineNr">256 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span> k < SIZE<span class="Delimiter">(</span>l<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L257" class="LineNr">257 </span> <span class="Normal">const</span> word& w = l<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span> -<span id="L258" class="LineNr">258 </span> <span class="Normal">uint8_t</span> val = hex_byte<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span> -<span id="L259" class="LineNr">259 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L252" class="LineNr">252 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>seg<span class="Delimiter">.</span>start<span class="Delimiter">));</span> +<span id="L253" class="LineNr">253 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"loading segment "</span> << i << <span class="Constant">" from "</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << end<span class="Delimiter">();</span> +<span id="L254" class="LineNr">254 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L255" class="LineNr">255 </span> <span class="Normal">const</span> line& l = seg<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L256" class="LineNr">256 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> k = <span class="Constant">0</span><span class="Delimiter">;</span> k < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++k<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L257" class="LineNr">257 </span> <span class="Normal">const</span> word& w = l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>k<span class="Delimiter">);</span> +<span id="L258" class="LineNr">258 </span> <span class="Normal">uint8_t</span> val = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L259" class="LineNr">259 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L260" class="LineNr">260 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>addr<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> -<span id="L261" class="LineNr">261 </span> write_mem_u8<span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span> +<span id="L261" class="LineNr">261 </span> <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">,</span> val<span class="Delimiter">);</span> <span id="L262" class="LineNr">262 </span> overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>addr<span class="Delimiter">);</span> -<span id="L263" class="LineNr">263 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"0x"</span> << HEXWORD << addr << <span class="Constant">" -> "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>read_mem_u8<span class="Delimiter">(</span>addr<span class="Delimiter">))</span> << end<span class="Delimiter">();</span> +<span id="L263" class="LineNr">263 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" -> "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L193'>read_mem_u8</a><span class="Delimiter">(</span>addr<span class="Delimiter">))</span> << end<span class="Delimiter">();</span> <span id="L264" class="LineNr">264 </span> ++addr<span class="Delimiter">;</span> <span id="L265" class="LineNr">265 </span> <span class="Delimiter">}</span> <span id="L266" class="LineNr">266 </span> <span class="Delimiter">}</span> -<span id="L267" class="LineNr">267 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> End_of_program = addr<span class="Delimiter">;</span> +<span id="L267" class="LineNr">267 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i == <span class="Constant">0</span><span class="Delimiter">)</span> <a href='010---vm.cc.html#L185'>End_of_program</a> = addr<span class="Delimiter">;</span> <span id="L268" class="LineNr">268 </span> <span class="Delimiter">}</span> -<span id="L269" class="LineNr">269 </span> EIP = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span> -<span id="L270" class="LineNr">270 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"done"</span> << end<span class="Delimiter">();</span> +<span id="L269" class="LineNr">269 </span> <a href='010---vm.cc.html#L29'>EIP</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span> +<span id="L270" class="LineNr">270 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"done"</span> << end<span class="Delimiter">();</span> <span id="L271" class="LineNr">271 </span><span class="Delimiter">}</span> <span id="L272" class="LineNr">272 </span> -<span id="L273" class="LineNr">273 </span><span class="Normal">uint8_t</span> hex_byte<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L273" class="LineNr">273 </span><span class="Normal">uint8_t</span> <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L274" class="LineNr">274 </span> istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span> <span id="L275" class="LineNr">275 </span> <span class="Normal">int</span> result = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L276" class="LineNr">276 </span> in >> std::hex >> result<span class="Delimiter">;</span> <span id="L277" class="LineNr">277 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L278" class="LineNr">278 </span> raise << <span class="Constant">"token '"</span> << s << <span class="Constant">"' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L278" class="LineNr">278 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"token '"</span> << s << <span class="Constant">"' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L279" class="LineNr">279 </span> <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span> <span id="L280" class="LineNr">280 </span> <span class="Delimiter">}</span> <span id="L281" class="LineNr">281 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result > <span class="Constant">0xff</span> || result < -<span class="Constant">0x8f</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L282" class="LineNr">282 </span> raise << <span class="Constant">"token '"</span> << s << <span class="Constant">"' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L282" class="LineNr">282 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"token '"</span> << s << <span class="Constant">"' is not a hex byte</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L283" class="LineNr">283 </span> <span class="Identifier">return</span> <span class="cSpecial">'\0'</span><span class="Delimiter">;</span> <span id="L284" class="LineNr">284 </span> <span class="Delimiter">}</span> <span id="L285" class="LineNr">285 </span> <span class="Identifier">return</span> <span class="Normal">static_cast</span><<span class="Normal">uint8_t</span>><span class="Delimiter">(</span>result<span class="Delimiter">);</span> @@ -379,35 +379,35 @@ if ('onhashchange' in window) { <span id="L316" class="LineNr">316 </span> <span id="L317" class="LineNr">317 </span><span class="Comment">//: helper for tests</span> <span id="L318" class="LineNr">318 </span><span class="Delimiter">:(code)</span> -<span id="L319" class="LineNr">319 </span><span class="Normal">void</span> parse_and_load<span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L320" class="LineNr">320 </span> program p<span class="Delimiter">;</span> +<span id="L319" class="LineNr">319 </span><span class="Normal">void</span> <a href='011run.cc.html#L319'>parse_and_load</a><span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L320" class="LineNr">320 </span> <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span> <span id="L321" class="LineNr">321 </span> istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span> <span id="L322" class="LineNr">322 </span> parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span> -<span id="L323" class="LineNr">323 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// if any stage raises errors, stop immediately</span> -<span id="L324" class="LineNr">324 </span> load<span class="Delimiter">(</span>p<span class="Delimiter">);</span> +<span id="L323" class="LineNr">323 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// if any stage raises errors, stop immediately</span> +<span id="L324" class="LineNr">324 </span> <a href='011run.cc.html#L240'>load</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span> <span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span> <span id="L326" class="LineNr">326 </span> <span id="L327" class="LineNr">327 </span><span class="SalientComment">//:: run</span> <span id="L328" class="LineNr">328 </span> <span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L330" class="LineNr">330 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"05"</span><span class="Delimiter">,</span> <span class="Constant">"add imm32 to EAX (add)"</span><span class="Delimiter">);</span> +<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"05"</span><span class="Delimiter">,</span> <span class="Constant">"add imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (add)"</span><span class="Delimiter">);</span> <span id="L331" class="LineNr">331 </span> <span id="L332" class="LineNr">332 </span><span class="Comment">//: our first opcode</span> <span id="L333" class="LineNr">333 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L334" class="LineNr">334 </span><span class="Normal">case</span> <span class="Constant">0x05</span>: <span class="Delimiter">{</span> <span class="Comment">// add imm32 to EAX</span> -<span id="L335" class="LineNr">335 </span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L336" class="LineNr">336 </span> trace<span class="Delimiter">(</span><span class="Constant">90</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="L337" class="LineNr">337 </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="L335" class="LineNr">335 </span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L336" class="LineNr">336 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << <span class="Constant">" to <a href='010---vm.cc.html#L23'>reg</a> EAX"</span> << end<span class="Delimiter">();</span> +<span id="L337" class="LineNr">337 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L338" class="LineNr">338 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span> <span id="L340" class="LineNr">340 </span> <span id="L341" class="LineNr">341 </span><span class="Delimiter">:(code)</span> <span id="L342" class="LineNr">342 </span><span class="Comment">// read a 32-bit int in little-endian order from the instruction stream</span> -<span id="L343" class="LineNr">343 </span><span class="Normal">int32_t</span> next32<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L344" class="LineNr">344 </span> <span class="Normal">int32_t</span> result = next<span class="Delimiter">();</span> -<span id="L345" class="LineNr">345 </span> result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span><<<span class="Constant">8</span><span class="Delimiter">);</span> -<span id="L346" class="LineNr">346 </span> result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span><<<span class="Constant">16</span><span class="Delimiter">);</span> -<span id="L347" class="LineNr">347 </span> result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span><<<span class="Constant">24</span><span class="Delimiter">);</span> +<span id="L343" class="LineNr">343 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L344" class="LineNr">344 </span> <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> +<span id="L345" class="LineNr">345 </span> result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">()</span><<<span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L346" class="LineNr">346 </span> result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">()</span><<<span class="Constant">16</span><span class="Delimiter">);</span> +<span id="L347" class="LineNr">347 </span> result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">()</span><<<span class="Constant">24</span><span class="Delimiter">);</span> <span id="L348" class="LineNr">348 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span> <span id="L350" class="LineNr">350 </span> @@ -417,12 +417,12 @@ if ('onhashchange' in window) { <span id="L354" class="LineNr">354 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L355" class="LineNr">355 </span> ostringstream out<span class="Delimiter">;</span> <span id="L356" class="LineNr">356 </span> out << w<span class="Delimiter">.</span>data<span class="Delimiter">;</span> -<span id="L357" class="LineNr">357 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L357" class="LineNr">357 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span id="L358" class="LineNr">358 </span> out << <span class="Constant">" /"</span> << w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L359" class="LineNr">359 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L360" class="LineNr">360 </span><span class="Delimiter">}</span> <span id="L361" class="LineNr">361 </span> -<span id="L362" class="LineNr">362 </span><span class="Normal">int32_t</span> parse_int<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L362" class="LineNr">362 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L363" class="LineNr">363 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L364" class="LineNr">364 </span> istringstream in<span class="Delimiter">(</span>s<span class="Delimiter">);</span> <span id="L365" class="LineNr">365 </span> in >> std::hex<span class="Delimiter">;</span> @@ -430,7 +430,7 @@ if ('onhashchange' in window) { <span id="L367" class="LineNr">367 </span> <span class="Normal">int32_t</span> result = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L368" class="LineNr">368 </span> in >> result<span class="Delimiter">;</span> <span id="L369" class="LineNr">369 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L370" class="LineNr">370 </span> raise << <span class="Constant">"not a number: "</span> << s << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L370" class="LineNr">370 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"not a number: "</span> << s << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L371" class="LineNr">371 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L372" class="LineNr">372 </span> <span class="Delimiter">}</span> <span id="L373" class="LineNr">373 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> @@ -438,19 +438,19 @@ if ('onhashchange' in window) { <span id="L375" class="LineNr">375 </span> <span class="Normal">uint32_t</span> uresult = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L376" class="LineNr">376 </span> in >> uresult<span class="Delimiter">;</span> <span id="L377" class="LineNr">377 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!in || !in<span class="Delimiter">.</span>eof<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L378" class="LineNr">378 </span> raise << <span class="Constant">"not a number: "</span> << s << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L378" class="LineNr">378 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"not a number: "</span> << s << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L379" class="LineNr">379 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L380" class="LineNr">380 </span> <span class="Delimiter">}</span> <span id="L381" class="LineNr">381 </span> <span class="Identifier">return</span> <span class="Normal">static_cast</span><<span class="Normal">int32_t</span>><span class="Delimiter">(</span>uresult<span class="Delimiter">);</span> <span id="L382" class="LineNr">382 </span><span class="Delimiter">}</span> <span id="L383" class="LineNr">383 </span><span class="Delimiter">:(before "End Unit Tests")</span> -<span id="L384" class="LineNr">384 </span><span class="Normal">void</span> test_parse_int<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L385" class="LineNr">385 </span> CHECK_EQ<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> parse_int<span class="Delimiter">(</span><span class="Constant">"0"</span><span class="Delimiter">));</span> -<span id="L386" class="LineNr">386 </span> CHECK_EQ<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> parse_int<span class="Delimiter">(</span><span class="Constant">"0x0"</span><span class="Delimiter">));</span> -<span id="L387" class="LineNr">387 </span> CHECK_EQ<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> parse_int<span class="Delimiter">(</span><span class="Constant">"0x0"</span><span class="Delimiter">));</span> -<span id="L388" class="LineNr">388 </span> CHECK_EQ<span class="Delimiter">(</span><span class="Constant">16</span><span class="Delimiter">,</span> parse_int<span class="Delimiter">(</span><span class="Constant">"10"</span><span class="Delimiter">));</span> <span class="Comment">// hex always</span> -<span id="L389" class="LineNr">389 </span> CHECK_EQ<span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> parse_int<span class="Delimiter">(</span><span class="Constant">"-1"</span><span class="Delimiter">));</span> -<span id="L390" class="LineNr">390 </span> CHECK_EQ<span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> parse_int<span class="Delimiter">(</span><span class="Constant">"0xffffffff"</span><span class="Delimiter">));</span> +<span id="L384" class="LineNr">384 </span><span class="Normal">void</span> <a href='011run.cc.html#L384'>test_parse_int</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L385" class="LineNr">385 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Constant">"0"</span><span class="Delimiter">));</span> +<span id="L386" class="LineNr">386 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Constant">"0x0"</span><span class="Delimiter">));</span> +<span id="L387" class="LineNr">387 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Constant">"0x0"</span><span class="Delimiter">));</span> +<span id="L388" class="LineNr">388 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><span class="Constant">16</span><span class="Delimiter">,</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Constant">"10"</span><span class="Delimiter">));</span> <span class="Comment">// hex always</span> +<span id="L389" class="LineNr">389 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Constant">"-1"</span><span class="Delimiter">));</span> +<span id="L390" class="LineNr">390 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>-<span class="Constant">1</span><span class="Delimiter">,</span> <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span><span class="Constant">"0xffffffff"</span><span class="Delimiter">));</span> <span id="L391" class="LineNr">391 </span><span class="Delimiter">}</span> </pre> </body> diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html index dd286c23..565f3d44 100644 --- a/html/subx/012elf.cc.html +++ b/html/subx/012elf.cc.html @@ -63,127 +63,127 @@ if ('onhashchange' in window) { <span id="L4" class="LineNr"> 4 </span> <span id="L5" class="LineNr"> 5 </span><span class="Delimiter">:(before "End Main")</span> <span id="L6" class="LineNr"> 6 </span>assert<span class="Delimiter">(</span>argc > <span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L7" class="LineNr"> 7 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_equal<span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L8" class="LineNr"> 8 </span> START_TRACING_UNTIL_END_OF_SCOPE<span class="Delimiter">;</span> +<span id="L7" class="LineNr"> 7 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L8" class="LineNr"> 8 </span> <a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span> <span id="L9" class="LineNr"> 9 </span> assert<span class="Delimiter">(</span>argc > <span class="Constant">2</span><span class="Delimiter">);</span> -<span id="L10" class="LineNr"> 10 </span> reset<span class="Delimiter">();</span> +<span id="L10" class="LineNr"> 10 </span> <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span> <span id="L11" class="LineNr"> 11 </span> cerr << std::hex<span class="Delimiter">;</span> -<span id="L12" class="LineNr"> 12 </span> load_elf<span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span> -<span id="L13" class="LineNr"> 13 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>EIP < End_of_program<span class="Delimiter">)</span> <span class="Comment">// weak final-gasp termination check</span> -<span id="L14" class="LineNr"> 14 </span> run_one_instruction<span class="Delimiter">();</span> -<span id="L15" class="LineNr"> 15 </span> raise << <span class="Constant">"executed past end of the world: "</span> << EIP << <span class="Constant">" vs "</span> << End_of_program << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L12" class="LineNr"> 12 </span> <a href='012elf.cc.html#L20'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span> +<span id="L13" class="LineNr"> 13 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> < <a href='010---vm.cc.html#L185'>End_of_program</a><span class="Delimiter">)</span> <span class="Comment">// weak final-gasp termination check</span> +<span id="L14" class="LineNr"> 14 </span> <a href='010---vm.cc.html#L287'>run_one_instruction</a><span class="Delimiter">();</span> +<span id="L15" class="LineNr"> 15 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"executed past end of the world: "</span> << <a href='010---vm.cc.html#L29'>EIP</a> << <span class="Constant">" vs "</span> << <a href='010---vm.cc.html#L185'>End_of_program</a> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L16" class="LineNr"> 16 </span> <span class="Identifier">return</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="Delimiter">:(code)</span> -<span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> load_elf<span class="Delimiter">(</span><span class="Normal">const</span> string& filename<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='012elf.cc.html#L20'>load_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> string& filename<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L21" class="LineNr"> 21 </span> <span class="Normal">int</span> fd = open<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> O_RDONLY<span class="Delimiter">);</span> -<span id="L22" class="LineNr"> 22 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>fd < <span class="Constant">0</span><span class="Delimiter">)</span> raise << filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> << <span class="Constant">": open"</span> << perr<span class="Delimiter">()</span> << <span class="cSpecial">'\n'</span> << die<span class="Delimiter">();</span> +<span id="L22" class="LineNr"> 22 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>fd < <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> << <span class="Constant">": open"</span> << <a href='012elf.cc.html#L159'>perr</a><span class="Delimiter">()</span> << <span class="cSpecial">'\n'</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> <span id="L23" class="LineNr"> 23 </span> <span class="Normal">off_t</span> size = lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_END</span><span class="Delimiter">);</span> <span id="L24" class="LineNr"> 24 </span> lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_SET</span><span class="Delimiter">);</span> <span id="L25" class="LineNr"> 25 </span> <span class="Normal">uint8_t</span>* elf_contents = <span class="Normal">static_cast</span><<span class="Normal">uint8_t</span>*><span class="Delimiter">(</span>malloc<span class="Delimiter">(</span>size<span class="Delimiter">));</span> -<span id="L26" class="LineNr"> 26 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> raise << <span class="Constant">"malloc("</span> << size << <span class="Constant">')'</span> << perr<span class="Delimiter">()</span> << <span class="cSpecial">'\n'</span> << die<span class="Delimiter">();</span> +<span id="L26" class="LineNr"> 26 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"malloc("</span> << size << <span class="Constant">')'</span> << <a href='012elf.cc.html#L159'>perr</a><span class="Delimiter">()</span> << <span class="cSpecial">'\n'</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> <span id="L27" class="LineNr"> 27 </span> <span class="Normal">ssize_t</span> read_size = read<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span> -<span id="L28" class="LineNr"> 28 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> raise << <span class="Constant">"read → "</span> << size << <span class="Constant">" (!= "</span> << read_size << <span class="Constant">')'</span> << perr<span class="Delimiter">()</span> << <span class="cSpecial">'\n'</span> << die<span class="Delimiter">();</span> -<span id="L29" class="LineNr"> 29 </span> load_elf_contents<span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span> +<span id="L28" class="LineNr"> 28 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"read → "</span> << size << <span class="Constant">" (!= "</span> << read_size << <span class="Constant">')'</span> << <a href='012elf.cc.html#L159'>perr</a><span class="Delimiter">()</span> << <span class="cSpecial">'\n'</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> +<span id="L29" class="LineNr"> 29 </span> <a href='012elf.cc.html#L33'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span> <span id="L30" class="LineNr"> 30 </span> free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span> <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span> <span id="L32" class="LineNr"> 32 </span> -<span id="L33" class="LineNr"> 33 </span><span class="Normal">void</span> load_elf_contents<span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L33" class="LineNr"> 33 </span><span class="Normal">void</span> <a href='012elf.cc.html#L33'>load_elf_contents</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L34" class="LineNr"> 34 </span> <span class="Normal">uint8_t</span> magic[<span class="Constant">5</span>] = <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">};</span> <span id="L35" class="LineNr"> 35 </span> memcpy<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span> <span id="L36" class="LineNr"> 36 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>memcmp<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> <span class="Constant">"</span><span class="cSpecial">\177</span><span class="Constant">ELF"</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span> -<span id="L37" class="LineNr"> 37 </span> raise << <span class="Constant">"Invalid ELF file; starts with </span><span class="cSpecial">\"</span><span class="Constant">"</span> << magic << <span class="Constant">'"'</span> << die<span class="Delimiter">();</span> +<span id="L37" class="LineNr"> 37 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Invalid ELF file; starts with </span><span class="cSpecial">\"</span><span class="Constant">"</span> << magic << <span class="Constant">'"'</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> <span id="L38" class="LineNr"> 38 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">4</span>] != <span class="Constant">1</span><span class="Delimiter">)</span> -<span id="L39" class="LineNr"> 39 </span> raise << <span class="Constant">"Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> +<span id="L39" class="LineNr"> 39 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> <span id="L40" class="LineNr"> 40 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">5</span>] != <span class="Constant">1</span><span class="Delimiter">)</span> -<span id="L41" class="LineNr"> 41 </span> raise << <span class="Constant">"Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> +<span id="L41" class="LineNr"> 41 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> <span id="L42" class="LineNr"> 42 </span> <span class="Comment">// unused: remaining 10 bytes of e_ident</span> -<span id="L43" class="LineNr"> 43 </span> <span class="Normal">uint32_t</span> e_machine_type = u32_in<span class="Delimiter">(</span>&elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span> +<span id="L43" class="LineNr"> 43 </span> <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span> <span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>e_machine_type != <span class="Constant">0x00030002</span><span class="Delimiter">)</span> -<span id="L45" class="LineNr"> 45 </span> raise << <span class="Constant">"ELF type/machine 0x"</span> << HEXWORD << e_machine_type << <span class="Constant">" isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> +<span id="L45" class="LineNr"> 45 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"ELF type/machine 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << e_machine_type << <span class="Constant">" isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> <span id="L46" class="LineNr"> 46 </span> <span class="Comment">// unused: e_version. We only support version 1, and later versions will be backwards compatible.</span> -<span id="L47" class="LineNr"> 47 </span> <span class="Normal">uint32_t</span> e_entry = u32_in<span class="Delimiter">(</span>&elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span> -<span id="L48" class="LineNr"> 48 </span> <span class="Normal">uint32_t</span> e_phoff = u32_in<span class="Delimiter">(</span>&elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span> +<span id="L47" class="LineNr"> 47 </span> <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span> +<span id="L48" class="LineNr"> 48 </span> <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span> <span id="L49" class="LineNr"> 49 </span> <span class="Comment">// unused: e_shoff</span> <span id="L50" class="LineNr"> 50 </span> <span class="Comment">// unused: e_flags</span> -<span id="L51" class="LineNr"> 51 </span> <span class="Normal">uint32_t</span> e_ehsize = u16_in<span class="Delimiter">(</span>&elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span> -<span id="L52" class="LineNr"> 52 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize < <span class="Constant">52</span><span class="Delimiter">)</span> raise << <span class="Constant">"Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> -<span id="L53" class="LineNr"> 53 </span> <span class="Normal">uint32_t</span> e_phentsize = u16_in<span class="Delimiter">(</span>&elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span> -<span id="L54" class="LineNr"> 54 </span> <span class="Normal">uint32_t</span> e_phnum = u16_in<span class="Delimiter">(</span>&elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span> -<span id="L55" class="LineNr"> 55 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << e_phnum << <span class="Constant">" entries in the program header, each "</span> << e_phentsize << <span class="Constant">" bytes long"</span> << end<span class="Delimiter">();</span> +<span id="L51" class="LineNr"> 51 </span> <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span>&elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span> +<span id="L52" class="LineNr"> 52 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize < <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> +<span id="L53" class="LineNr"> 53 </span> <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span>&elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span> +<span id="L54" class="LineNr"> 54 </span> <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span>&elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span> +<span id="L55" class="LineNr"> 55 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << e_phnum << <span class="Constant">" entries in the <a href='011run.cc.html#L99'>program</a> header, each "</span> << e_phentsize << <span class="Constant">" bytes long"</span> << end<span class="Delimiter">();</span> <span id="L56" class="LineNr"> 56 </span> <span class="Comment">// unused: e_shentsize</span> <span id="L57" class="LineNr"> 57 </span> <span class="Comment">// unused: e_shnum</span> <span id="L58" class="LineNr"> 58 </span> <span class="Comment">// unused: e_shstrndx</span> <span id="L59" class="LineNr"> 59 </span> <span id="L60" class="LineNr"> 60 </span> set<<span class="Normal">uint32_t</span>> overlap<span class="Delimiter">;</span> <span class="Comment">// to detect overlapping segments</span> <span id="L61" class="LineNr"> 61 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < e_phnum<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> -<span id="L62" class="LineNr"> 62 </span> load_segment_from_program_header<span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> i<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">,</span> overlap<span class="Delimiter">);</span> +<span id="L62" class="LineNr"> 62 </span> <a href='012elf.cc.html#L96'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> i<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">,</span> overlap<span class="Delimiter">);</span> <span id="L63" class="LineNr"> 63 </span> <span id="L64" class="LineNr"> 64 </span> <span class="Comment">// initialize code and stack</span> -<span id="L65" class="LineNr"> 65 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>STACK_SEGMENT<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> -<span id="L66" class="LineNr"> 66 </span> Mem<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>STACK_SEGMENT<span class="Delimiter">));</span> -<span id="L67" class="LineNr"> 67 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>AFTER_STACK<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> -<span id="L68" class="LineNr"> 68 </span> Reg[ESP]<span class="Delimiter">.</span>u = AFTER_STACK<span class="Delimiter">;</span> +<span id="L65" class="LineNr"> 65 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L137'>STACK_SEGMENT</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L66" class="LineNr"> 66 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='012elf.cc.html#L137'>STACK_SEGMENT</a><span class="Delimiter">));</span> +<span id="L67" class="LineNr"> 67 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='012elf.cc.html#L138'>AFTER_STACK</a><span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L68" class="LineNr"> 68 </span> Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L138'>AFTER_STACK</a><span class="Delimiter">;</span> <span id="L69" class="LineNr"> 69 </span> Reg[EBP]<span class="Delimiter">.</span>u = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L70" class="LineNr"> 70 </span> EIP = e_entry<span class="Delimiter">;</span> +<span id="L70" class="LineNr"> 70 </span> <a href='010---vm.cc.html#L29'>EIP</a> = e_entry<span class="Delimiter">;</span> <span id="L71" class="LineNr"> 71 </span> <span id="L72" class="LineNr"> 72 </span> <span class="Comment">// initialize args on stack</span> <span id="L73" class="LineNr"> 73 </span> <span class="Comment">// no envp for now</span> <span id="L74" class="LineNr"> 74 </span> <span class="Comment">// we wastefully use a separate page of memory for argv</span> -<span id="L75" class="LineNr"> 75 </span> Mem<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>ARGV_DATA_SEGMENT<span class="Delimiter">));</span> -<span id="L76" class="LineNr"> 76 </span> <span class="Normal">uint32_t</span> argv_data = ARGV_DATA_SEGMENT<span class="Delimiter">;</span> +<span id="L75" class="LineNr"> 75 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a><span class="Delimiter">));</span> +<span id="L76" class="LineNr"> 76 </span> <span class="Normal">uint32_t</span> argv_data = <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a><span class="Delimiter">;</span> <span id="L77" class="LineNr"> 77 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = argc-<span class="Constant">1</span><span class="Delimiter">;</span> i >= <span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span> --i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L78" class="LineNr"> 78 </span> push<span class="Delimiter">(</span>argv_data<span class="Delimiter">);</span> +<span id="L78" class="LineNr"> 78 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">);</span> <span id="L79" class="LineNr"> 79 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j <= strlen<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L80" class="LineNr"> 80 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>argv_data<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> <span class="Comment">// don't bother comparing ARGV and STACK</span> -<span id="L81" class="LineNr"> 81 </span> write_mem_u8<span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span> +<span id="L81" class="LineNr"> 81 </span> <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span> <span id="L82" class="LineNr"> 82 </span> argv_data += <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">char</span><span class="Delimiter">);</span> -<span id="L83" class="LineNr"> 83 </span> assert<span class="Delimiter">(</span>argv_data < ARGV_DATA_SEGMENT + INITIAL_SEGMENT_SIZE<span class="Delimiter">);</span> +<span id="L83" class="LineNr"> 83 </span> assert<span class="Delimiter">(</span>argv_data < <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a> + <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">);</span> <span id="L84" class="LineNr"> 84 </span> <span class="Delimiter">}</span> <span id="L85" class="LineNr"> 85 </span> <span class="Delimiter">}</span> -<span id="L86" class="LineNr"> 86 </span> push<span class="Delimiter">(</span>argc-<span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L86" class="LineNr"> 86 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>argc-<span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span> <span id="L87" class="LineNr"> 87 </span><span class="Delimiter">}</span> <span id="L88" class="LineNr"> 88 </span> -<span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> push<span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L90" class="LineNr"> 90 </span> Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span> -<span id="L91" class="LineNr"> 91 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"decrementing ESP to 0x"</span> << HEXWORD << Reg[ESP]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L92" class="LineNr"> 92 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"pushing value 0x"</span> << HEXWORD << val << end<span class="Delimiter">();</span> -<span id="L93" class="LineNr"> 93 </span> write_mem_u32<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span> +<span id="L91" class="LineNr"> 91 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[ESP]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L92" class="LineNr"> 92 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"pushing value 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << val << end<span class="Delimiter">();</span> +<span id="L93" class="LineNr"> 93 </span> <a href='010---vm.cc.html#L262'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span> <span id="L94" class="LineNr"> 94 </span><span class="Delimiter">}</span> <span id="L95" class="LineNr"> 95 </span> -<span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> load_segment_from_program_header<span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">int</span> segment_index<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">,</span> set<<span class="Normal">uint32_t</span>>& overlap<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L97" class="LineNr"> 97 </span> <span class="Normal">uint32_t</span> p_type = u32_in<span class="Delimiter">(</span>&elf_contents[offset]<span class="Delimiter">);</span> -<span id="L98" class="LineNr"> 98 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"program header at offset "</span> << offset << <span class="Constant">": type "</span> << p_type << end<span class="Delimiter">();</span> +<span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> <a href='012elf.cc.html#L96'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">int</span> segment_index<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">,</span> set<<span class="Normal">uint32_t</span>>& overlap<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L97" class="LineNr"> 97 </span> <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[offset]<span class="Delimiter">);</span> +<span id="L98" class="LineNr"> 98 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"program header at offset "</span> << offset << <span class="Constant">": type "</span> << p_type << end<span class="Delimiter">();</span> <span id="L99" class="LineNr"> 99 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p_type != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L100" class="LineNr">100 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"ignoring segment at offset "</span> << offset << <span class="Constant">" of non PT_LOAD type "</span> << p_type << <span class="Constant">" (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)"</span> << end<span class="Delimiter">();</span> +<span id="L100" class="LineNr">100 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"ignoring segment at offset "</span> << offset << <span class="Constant">" of non PT_LOAD type "</span> << p_type << <span class="Constant">" (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)"</span> << end<span class="Delimiter">();</span> <span id="L101" class="LineNr">101 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L102" class="LineNr">102 </span> <span class="Delimiter">}</span> -<span id="L103" class="LineNr">103 </span> <span class="Normal">uint32_t</span> p_offset = u32_in<span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span> -<span id="L104" class="LineNr">104 </span> <span class="Normal">uint32_t</span> p_vaddr = u32_in<span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span> -<span id="L105" class="LineNr">105 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize > p_vaddr<span class="Delimiter">)</span> raise << <span class="Constant">"Invalid binary; program header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> +<span id="L103" class="LineNr">103 </span> <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span> +<span id="L104" class="LineNr">104 </span> <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span> +<span id="L105" class="LineNr">105 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize > p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Invalid binary; <a href='011run.cc.html#L99'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> <span id="L106" class="LineNr">106 </span> <span class="Comment">// unused: p_paddr</span> -<span id="L107" class="LineNr">107 </span> <span class="Normal">uint32_t</span> p_filesz = u32_in<span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span> -<span id="L108" class="LineNr">108 </span> <span class="Normal">uint32_t</span> p_memsz = u32_in<span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span> +<span id="L107" class="LineNr">107 </span> <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span> +<span id="L108" class="LineNr">108 </span> <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span>&elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span> <span id="L109" class="LineNr">109 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span> -<span id="L110" class="LineNr">110 </span> raise << <span class="Constant">"Can't yet handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> +<span id="L110" class="LineNr">110 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Can't yet handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)</span><span class="cSpecial">\n</span><span class="Constant">"</span> << die<span class="Delimiter">();</span> <span id="L111" class="LineNr">111 </span> <span id="L112" class="LineNr">112 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz > size<span class="Delimiter">)</span> -<span id="L113" class="LineNr">113 </span> raise << <span class="Constant">"Invalid binary; segment at offset "</span> << offset << <span class="Constant">" is too large: wants to end at "</span> << p_offset+p_filesz << <span class="Constant">" but the file ends at "</span> << size << <span class="cSpecial">'\n'</span> << die<span class="Delimiter">();</span> -<span id="L114" class="LineNr">114 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p_memsz >= INITIAL_SEGMENT_SIZE<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L115" class="LineNr">115 </span> raise << <span class="Constant">"Code segment too small for SubX; for now please manually increase INITIAL_SEGMENT_SIZE.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L113" class="LineNr">113 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Invalid binary; segment at offset "</span> << offset << <span class="Constant">" is too large: wants to end at "</span> << p_offset+p_filesz << <span class="Constant">" but the file ends at "</span> << size << <span class="cSpecial">'\n'</span> << <a href='012elf.cc.html#L168'>die</a><span class="Delimiter">();</span> +<span id="L114" class="LineNr">114 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p_memsz >= <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L115" class="LineNr">115 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Code segment too small for SubX; for now please manually increase INITIAL_SEGMENT_SIZE.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L116" class="LineNr">116 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L117" class="LineNr">117 </span> <span class="Delimiter">}</span> -<span id="L118" class="LineNr">118 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"blitting file offsets ("</span> << p_offset << <span class="Constant">", "</span> << <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> << <span class="Constant">") to addresses ("</span> << p_vaddr << <span class="Constant">", "</span> << <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> << <span class="Constant">')'</span> << end<span class="Delimiter">();</span> +<span id="L118" class="LineNr">118 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"load"</span><span class="Delimiter">)</span> << <span class="Constant">"blitting file offsets ("</span> << p_offset << <span class="Constant">", "</span> << <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> << <span class="Constant">") to addresses ("</span> << p_vaddr << <span class="Constant">", "</span> << <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> << <span class="Constant">')'</span> << end<span class="Delimiter">();</span> <span id="L119" class="LineNr">119 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>size > p_memsz<span class="Delimiter">)</span> size = p_memsz<span class="Delimiter">;</span> -<span id="L120" class="LineNr">120 </span> Mem<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>p_vaddr<span class="Delimiter">));</span> +<span id="L120" class="LineNr">120 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>p_vaddr<span class="Delimiter">));</span> <span id="L121" class="LineNr">121 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < p_filesz<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L122" class="LineNr">122 </span> assert<span class="Delimiter">(</span>overlap<span class="Delimiter">.</span>find<span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">)</span> == overlap<span class="Delimiter">.</span>end<span class="Delimiter">());</span> -<span id="L123" class="LineNr">123 </span> write_mem_u8<span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span> +<span id="L123" class="LineNr">123 </span> <a href='010---vm.cc.html#L254'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span> <span id="L124" class="LineNr">124 </span> overlap<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">);</span> <span id="L125" class="LineNr">125 </span> <span class="Delimiter">}</span> -<span id="L126" class="LineNr">126 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>segment_index == <span class="Constant">0</span> && End_of_program < p_vaddr+p_memsz<span class="Delimiter">)</span> -<span id="L127" class="LineNr">127 </span> End_of_program = p_vaddr+p_memsz<span class="Delimiter">;</span> +<span id="L126" class="LineNr">126 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>segment_index == <span class="Constant">0</span> && <a href='010---vm.cc.html#L185'>End_of_program</a> < p_vaddr+p_memsz<span class="Delimiter">)</span> +<span id="L127" class="LineNr">127 </span> <a href='010---vm.cc.html#L185'>End_of_program</a> = p_vaddr+p_memsz<span class="Delimiter">;</span> <span id="L128" class="LineNr">128 </span><span class="Delimiter">}</span> <span id="L129" class="LineNr">129 </span> <span id="L130" class="LineNr">130 </span><span class="Delimiter">:(before "End Includes")</span> @@ -191,43 +191,43 @@ if ('onhashchange' in window) { <span id="L132" class="LineNr">132 </span><span class="Comment">// code: 0x09000000 -> 0x09ffffff</span> <span id="L133" class="LineNr">133 </span><span class="Comment">// data/heap: 0x0a000000 -> 0x0affffff</span> <span id="L134" class="LineNr">134 </span><span class="Comment">// stack: 0x0b000ffc -> 0x0b000000 (downward)</span> -<span id="L135" class="LineNr">135 </span><span class="Normal">const</span> <span class="Normal">int</span> CODE_SEGMENT = <span class="Constant">0x09000000</span><span class="Delimiter">;</span> -<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">int</span> DATA_SEGMENT = <span class="Constant">0x0a000000</span><span class="Delimiter">;</span> -<span id="L137" class="LineNr">137 </span><span class="Normal">const</span> <span class="Normal">int</span> STACK_SEGMENT = <span class="Constant">0x0b000000</span><span class="Delimiter">;</span> -<span id="L138" class="LineNr">138 </span><span class="Normal">const</span> <span class="Normal">int</span> AFTER_STACK = <span class="Constant">0x0b000ffc</span><span class="Delimiter">;</span> <span class="Comment">// forget final word because of the off-by-one with INITIAL_SEGMENT_SIZE;</span> -<span id="L139" class="LineNr">139 </span><span class="Normal">const</span> <span class="Normal">int</span> ARGV_DATA_SEGMENT = <span class="Constant">0x0c000000</span><span class="Delimiter">;</span> +<span id="L135" class="LineNr">135 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L135'>CODE_SEGMENT</a> = <span class="Constant">0x09000000</span><span class="Delimiter">;</span> +<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L136'>DATA_SEGMENT</a> = <span class="Constant">0x0a000000</span><span class="Delimiter">;</span> +<span id="L137" class="LineNr">137 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L137'>STACK_SEGMENT</a> = <span class="Constant">0x0b000000</span><span class="Delimiter">;</span> +<span id="L138" class="LineNr">138 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L138'>AFTER_STACK</a> = <span class="Constant">0x0b000ffc</span><span class="Delimiter">;</span> <span class="Comment">// forget final word because of the off-by-one with INITIAL_SEGMENT_SIZE;</span> +<span id="L139" class="LineNr">139 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x0c000000</span><span class="Delimiter">;</span> <span id="L140" class="LineNr">140 </span><span class="Delimiter">:(code)</span> -<span id="L141" class="LineNr">141 </span><span class="Normal">void</span> dump_stack<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L141" class="LineNr">141 </span><span class="Normal">void</span> <a href='012elf.cc.html#L141'>dump_stack</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L142" class="LineNr">142 </span> cerr << <span class="Constant">"stack:</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L143" class="LineNr">143 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">uint32_t</span> a = AFTER_STACK-<span class="Constant">4</span><span class="Delimiter">;</span> a > Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> a -= <span class="Constant">4</span><span class="Delimiter">)</span> -<span id="L144" class="LineNr">144 </span> cerr << <span class="Constant">" 0x"</span> << HEXWORD << a << <span class="Constant">" => 0x"</span> << HEXWORD << read_mem_u32<span class="Delimiter">(</span>a<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L145" class="LineNr">145 </span> cerr << <span class="Constant">" 0x"</span> << HEXWORD << Reg[ESP]<span class="Delimiter">.</span>u << <span class="Constant">" => 0x"</span> << HEXWORD << read_mem_u32<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << <span class="Constant">" <=== ESP</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L144" class="LineNr">144 </span> cerr << <span class="Constant">" 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << a << <span class="Constant">" => 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L145" class="LineNr">145 </span> cerr << <span class="Constant">" 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[ESP]<span class="Delimiter">.</span>u << <span class="Constant">" => 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << <span class="Constant">" <=== <a href='010---vm.cc.html#L17'>ESP</a></span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L146" class="LineNr">146 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">uint32_t</span> a = Reg[ESP]<span class="Delimiter">.</span>u-<span class="Constant">4</span><span class="Delimiter">;</span> a > Reg[ESP]<span class="Delimiter">.</span>u-<span class="Constant">40</span><span class="Delimiter">;</span> a -= <span class="Constant">4</span><span class="Delimiter">)</span> -<span id="L147" class="LineNr">147 </span> cerr << <span class="Constant">" 0x"</span> << HEXWORD << a << <span class="Constant">" => 0x"</span> << HEXWORD << read_mem_u32<span class="Delimiter">(</span>a<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L147" class="LineNr">147 </span> cerr << <span class="Constant">" 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << a << <span class="Constant">" => 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>a<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span> <span id="L149" class="LineNr">149 </span> -<span id="L150" class="LineNr">150 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> u32_in<span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L150" class="LineNr">150 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L150'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L151" class="LineNr">151 </span> <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] << <span class="Constant">8</span> | p[<span class="Constant">2</span>] << <span class="Constant">16</span> | p[<span class="Constant">3</span>] << <span class="Constant">24</span><span class="Delimiter">;</span> <span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span> <span id="L153" class="LineNr">153 </span> -<span id="L154" class="LineNr">154 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> u16_in<span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L154" class="LineNr">154 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L154'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L155" class="LineNr">155 </span> <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] << <span class="Constant">8</span><span class="Delimiter">;</span> <span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span> <span id="L157" class="LineNr">157 </span> <span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L159" class="LineNr">159 </span><span class="Normal">struct</span> perr <span class="Delimiter">{};</span> +<span id="L159" class="LineNr">159 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L159'>perr</a> <span class="Delimiter">{};</span> <span id="L160" class="LineNr">160 </span><span class="Delimiter">:(code)</span> -<span id="L161" class="LineNr">161 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> perr <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L161" class="LineNr">161 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& os<span class="Delimiter">,</span> <a href='012elf.cc.html#L159'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L162" class="LineNr">162 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span> <span id="L163" class="LineNr">163 </span> os << <span class="Constant">": "</span> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span> <span id="L164" class="LineNr">164 </span> <span class="Identifier">return</span> os<span class="Delimiter">;</span> <span id="L165" class="LineNr">165 </span><span class="Delimiter">}</span> <span id="L166" class="LineNr">166 </span> <span id="L167" class="LineNr">167 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L168" class="LineNr">168 </span><span class="Normal">struct</span> die <span class="Delimiter">{};</span> +<span id="L168" class="LineNr">168 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L168'>die</a> <span class="Delimiter">{};</span> <span id="L169" class="LineNr">169 </span><span class="Delimiter">:(code)</span> -<span id="L170" class="LineNr">170 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> die <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L171" class="LineNr">171 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Trace_stream<span class="Delimiter">)</span> Trace_stream<span class="Delimiter">-></span>newline<span class="Delimiter">();</span> +<span id="L170" class="LineNr">170 </span>ostream& <span class="Normal">operator</span><<<span class="Delimiter">(</span>ostream& <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='012elf.cc.html#L168'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L171" class="LineNr">171 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L174'>Trace_stream</a><span class="Delimiter">-></span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span> <span id="L172" class="LineNr">172 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span> <span id="L174" class="LineNr">174 </span> diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html index f111ae2b..606a4b21 100644 --- a/html/subx/013direct_addressing.cc.html +++ b/html/subx/013direct_addressing.cc.html @@ -66,7 +66,7 @@ if ('onhashchange' in window) { <span id="L1" class="LineNr"> 1 </span><span class="Comment">//: operating directly on a register</span> <span id="L2" class="LineNr"> 2 </span> <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L4" class="LineNr"> 4 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"01"</span><span class="Delimiter">,</span> <span class="Constant">"add r32 to rm32 (add)"</span><span class="Delimiter">);</span> +<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"01"</span><span class="Delimiter">,</span> <span class="Constant">"add r32 to rm32 (add)"</span><span class="Delimiter">);</span> <span id="L5" class="LineNr"> 5 </span> <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario add_r32_to_r32)</span> <span id="L7" class="LineNr"> 7 </span><span class="Special">% Reg[EAX].i = 0x10;</span> @@ -75,17 +75,17 @@ if ('onhashchange' in window) { <span id="L10" class="LineNr"> 10 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L11" class="LineNr"> 11 </span> <span class="PreProc">0</span><span class="Constant">1</span> d8 <span class="Comment"># add EBX to EAX</span> <span id="L12" class="LineNr"> 12 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add EBX to r/m32</span> -<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> +<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x00000011</span> <span id="L16" class="LineNr"> 16 </span> <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> <span class="Constant">0x01</span>: <span class="Delimiter">{</span> <span class="Comment">// add r32 to r/m32</span> -<span id="L19" class="LineNr"> 19 </span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L19" class="LineNr"> 19 </span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L20" class="LineNr"> 20 </span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L21" class="LineNr"> 21 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add "</span> << rname<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" to r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L22" class="LineNr"> 22 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L23" class="LineNr"> 23 </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="L21" class="LineNr"> 21 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" to r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L22" class="LineNr"> 22 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L23" class="LineNr"> 23 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span> <span id="L24" class="LineNr"> 24 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span> <span id="L26" class="LineNr"> 26 </span> @@ -93,19 +93,19 @@ if ('onhashchange' in window) { <span id="L28" class="LineNr"> 28 </span><span class="Comment">// Implement tables 2-2 and 2-3 in the Intel manual, Volume 2.</span> <span id="L29" class="LineNr"> 29 </span><span class="Comment">// We return a pointer so that instructions can write to multiple bytes in</span> <span id="L30" class="LineNr"> 30 </span><span class="Comment">// 'Mem' at once.</span> -<span id="L31" class="LineNr"> 31 </span><span class="Normal">int32_t</span>* effective_address<span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L31" class="LineNr"> 31 </span><span class="Normal">int32_t</span>* <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L32" class="LineNr"> 32 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm>><span class="Constant">6</span><span class="Delimiter">);</span> <span id="L33" class="LineNr"> 33 </span> <span class="Comment">// ignore middle 3 'reg opcode' bits</span> <span id="L34" class="LineNr"> 34 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm & <span class="Constant">0x7</span><span class="Delimiter">;</span> <span id="L35" class="LineNr"> 35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L36" class="LineNr"> 36 </span> <span class="Comment">// mod 3 is just register direct addressing</span> -<span id="L37" class="LineNr"> 37 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"r/m32 is "</span> << rname<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L37" class="LineNr"> 37 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"r/m32 is "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L38" class="LineNr"> 38 </span> <span class="Identifier">return</span> &Reg[rm]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> <span id="L39" class="LineNr"> 39 </span> <span class="Delimiter">}</span> -<span id="L40" class="LineNr"> 40 </span> <span class="Identifier">return</span> mem_addr_i32<span class="Delimiter">(</span>effective_address_number<span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> +<span id="L40" class="LineNr"> 40 </span> <span class="Identifier">return</span> <a href='010---vm.cc.html#L239'>mem_addr_i32</a><span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">}</span> <span id="L42" class="LineNr"> 42 </span> -<span id="L43" class="LineNr"> 43 </span><span class="Normal">uint32_t</span> effective_address_number<span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L43" class="LineNr"> 43 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L44" class="LineNr"> 44 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm>><span class="Constant">6</span><span class="Delimiter">);</span> <span id="L45" class="LineNr"> 45 </span> <span class="Comment">// ignore middle 3 'reg opcode' bits</span> <span id="L46" class="LineNr"> 46 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rm = modrm & <span class="Constant">0x7</span><span class="Delimiter">;</span> @@ -113,18 +113,18 @@ if ('onhashchange' in window) { <span id="L48" class="LineNr"> 48 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>mod<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L49" class="LineNr"> 49 </span> <span class="Normal">case</span> <span class="Constant">3</span>: <span id="L50" class="LineNr"> 50 </span> <span class="Comment">// mod 3 is just register direct addressing</span> -<span id="L51" class="LineNr"> 51 </span> raise << <span class="Constant">"unexpected direct addressing mode</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L51" class="LineNr"> 51 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"unexpected direct addressing mode</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L52" class="LineNr"> 52 </span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L53" class="LineNr"> 53 </span> <span class="Comment">// End Mod Special-cases(addr)</span> <span id="L54" class="LineNr"> 54 </span> <span class="Normal">default</span>: -<span id="L55" class="LineNr"> 55 </span> cerr << <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="L55" class="LineNr"> 55 </span> cerr << <span class="Constant">"unrecognized mod bits: "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>mod<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L56" class="LineNr"> 56 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L57" class="LineNr"> 57 </span> <span class="Delimiter">}</span> <span id="L58" class="LineNr"> 58 </span> <span class="Comment">//: other mods are indirect, and they'll set addr appropriately</span> <span id="L59" class="LineNr"> 59 </span> <span class="Identifier">return</span> addr<span class="Delimiter">;</span> <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">}</span> <span id="L61" class="LineNr"> 61 </span> -<span id="L62" class="LineNr"> 62 </span>string rname<span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L62" class="LineNr"> 62 </span>string <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L63" class="LineNr"> 63 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L64" class="LineNr"> 64 </span> <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">"EAX"</span><span class="Delimiter">;</span> <span id="L65" class="LineNr"> 65 </span> <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">"ECX"</span><span class="Delimiter">;</span> @@ -134,14 +134,14 @@ if ('onhashchange' in window) { <span id="L69" class="LineNr"> 69 </span> <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">"EBP"</span><span class="Delimiter">;</span> <span id="L70" class="LineNr"> 70 </span> <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">"ESI"</span><span class="Delimiter">;</span> <span id="L71" class="LineNr"> 71 </span> <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">"EDI"</span><span class="Delimiter">;</span> -<span id="L72" class="LineNr"> 72 </span> <span class="Normal">default</span>: raise << <span class="Constant">"invalid register "</span> << r << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> +<span id="L72" class="LineNr"> 72 </span> <span class="Normal">default</span>: <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"invalid register "</span> << r << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L73" class="LineNr"> 73 </span> <span class="Delimiter">}</span> <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span> <span id="L75" class="LineNr"> 75 </span> <span id="L76" class="LineNr"> 76 </span><span class="SalientComment">//:: subtract</span> <span id="L77" class="LineNr"> 77 </span> <span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L79" class="LineNr"> 79 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"29"</span><span class="Delimiter">,</span> <span class="Constant">"subtract r32 from rm32 (sub)"</span><span class="Delimiter">);</span> +<span id="L79" class="LineNr"> 79 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"29"</span><span class="Delimiter">,</span> <span class="Constant">"subtract r32 from rm32 (sub)"</span><span class="Delimiter">);</span> <span id="L80" class="LineNr"> 80 </span> <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenario subtract_r32_from_r32)</span> <span id="L82" class="LineNr"> 82 </span><span class="Special">% Reg[EAX].i = 10;</span> @@ -150,24 +150,24 @@ if ('onhashchange' in window) { <span id="L85" class="LineNr"> 85 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L86" class="LineNr"> 86 </span> <span class="Constant">29</span> d8 <span class="Comment"># subtract EBX from EAX</span> <span id="L87" class="LineNr"> 87 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: subtract EBX from r/m32</span> -<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32</span> +<span id="L89" class="LineNr"> 89 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: storing 0x00000009</span> <span id="L91" class="LineNr"> 91 </span> <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L93" class="LineNr"> 93 </span><span class="Normal">case</span> <span class="Constant">0x29</span>: <span class="Delimiter">{</span> <span class="Comment">// subtract r32 from r/m32</span> -<span id="L94" class="LineNr"> 94 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L94" class="LineNr"> 94 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L95" class="LineNr"> 95 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L96" class="LineNr"> 96 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract "</span> << rname<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" from r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L97" class="LineNr"> 97 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L98" class="LineNr"> 98 </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="L96" class="LineNr"> 96 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" from r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L97" class="LineNr"> 97 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L98" class="LineNr"> 98 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">);</span> <span id="L99" class="LineNr"> 99 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L100" class="LineNr">100 </span><span class="Delimiter">}</span> <span id="L101" class="LineNr">101 </span> <span id="L102" class="LineNr">102 </span><span class="SalientComment">//:: multiply</span> <span id="L103" class="LineNr">103 </span> <span id="L104" class="LineNr">104 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L105" class="LineNr">105 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"f7"</span><span class="Delimiter">,</span> <span class="Constant">"negate/multiply rm32 (with EAX if necessary) depending on subop (neg/mul)"</span><span class="Delimiter">);</span> +<span id="L105" class="LineNr">105 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"f7"</span><span class="Delimiter">,</span> <span class="Constant">"negate/multiply rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop (neg/mul)"</span><span class="Delimiter">);</span> <span id="L106" class="LineNr">106 </span> <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(scenario multiply_eax_by_r32)</span> <span id="L108" class="LineNr">108 </span><span class="Special">% Reg[EAX].i = 4;</span> @@ -177,29 +177,29 @@ if ('onhashchange' in window) { <span id="L112" class="LineNr">112 </span> f7 e1 <span class="Comment"># multiply EAX by ECX</span> <span id="L113" class="LineNr">113 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop mul) 001 (src ECX)</span> <span id="L114" class="LineNr">114 </span><span class="traceContains">+run: operate on r/m32</span> -<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: r/m32 is ECX</span> -<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: subop: multiply EAX by r/m32</span> +<span id="L115" class="LineNr">115 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L14'>ECX</a></span> +<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32</span> <span id="L117" class="LineNr">117 </span><span class="traceContains">+run: storing 0x0000000c</span> <span id="L118" class="LineNr">118 </span> <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L120" class="LineNr">120 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span> <span class="Comment">// xor r32 with r/m32</span> -<span id="L121" class="LineNr">121 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> -<span id="L122" class="LineNr">122 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"operate on r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L123" class="LineNr">123 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L121" class="LineNr">121 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> +<span id="L122" class="LineNr">122 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"operate on r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L123" class="LineNr">123 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L124" class="LineNr">124 </span> <span class="Normal">const</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="L125" class="LineNr">125 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L126" class="LineNr">126 </span> <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span> <span class="Comment">// mul unsigned EAX by r/m32</span> -<span id="L127" class="LineNr">127 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop: multiply EAX by r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L127" class="LineNr">127 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32"</span> << end<span class="Delimiter">();</span> <span id="L128" class="LineNr">128 </span> <span class="Normal">const</span> <span class="Normal">uint64_t</span> result = Reg[EAX]<span class="Delimiter">.</span>u * <span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span> <span id="L129" class="LineNr">129 </span> Reg[EAX]<span class="Delimiter">.</span>u = result & <span class="Constant">0xffffffff</span><span class="Delimiter">;</span> <span id="L130" class="LineNr">130 </span> Reg[EDX]<span class="Delimiter">.</span>u = result >> <span class="Constant">32</span><span class="Delimiter">;</span> -<span id="L131" class="LineNr">131 </span> OF = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L132" class="LineNr">132 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << Reg[EAX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L131" class="LineNr">131 </span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L132" class="LineNr">132 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[EAX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L133" class="LineNr">133 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L134" class="LineNr">134 </span> <span class="Delimiter">}</span> <span id="L135" class="LineNr">135 </span> <span class="Comment">// End Op f7 Subops</span> <span id="L136" class="LineNr">136 </span> <span class="Normal">default</span>: -<span id="L137" class="LineNr">137 </span> cerr << <span class="Constant">"unrecognized sub-opcode after f7: "</span> << NUM<span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L137" class="LineNr">137 </span> cerr << <span class="Constant">"unrecognized sub-opcode after f7: "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L138" class="LineNr">138 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L139" class="LineNr">139 </span> <span class="Delimiter">}</span> <span id="L140" class="LineNr">140 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -208,7 +208,7 @@ if ('onhashchange' in window) { <span id="L143" class="LineNr">143 </span><span class="Comment">//:</span> <span id="L144" class="LineNr">144 </span> <span id="L145" class="LineNr">145 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L146" class="LineNr">146 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"af"</span><span class="Delimiter">,</span> <span class="Constant">"multiply rm32 into r32 (imul)"</span><span class="Delimiter">);</span> +<span id="L146" class="LineNr">146 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"af"</span><span class="Delimiter">,</span> <span class="Constant">"multiply rm32 into r32 (imul)"</span><span class="Delimiter">);</span> <span id="L147" class="LineNr">147 </span> <span id="L148" class="LineNr">148 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span> <span id="L149" class="LineNr">149 </span><span class="Special">% Reg[EAX].i = 4;</span> @@ -217,17 +217,17 @@ if ('onhashchange' in window) { <span id="L152" class="LineNr">152 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L153" class="LineNr">153 </span> <span class="Constant">0f</span> af d8 <span class="Comment"># subtract EBX into EAX</span> <span id="L154" class="LineNr">154 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L155" class="LineNr">155 </span><span class="traceContains">+run: multiply r/m32 into EBX</span> -<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L155" class="LineNr">155 </span><span class="traceContains">+run: multiply r/m32 into <a href='010---vm.cc.html#L16'>EBX</a></span> +<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L157" class="LineNr">157 </span><span class="traceContains">+run: storing 0x00000008</span> <span id="L158" class="LineNr">158 </span> <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L160" class="LineNr">160 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span> <span class="Comment">// multiply r32 into r/m32</span> -<span id="L161" class="LineNr">161 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L161" class="LineNr">161 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L162" class="LineNr">162 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg2 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L163" class="LineNr">163 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"multiply r/m32 into "</span> << rname<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L164" class="LineNr">164 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L165" class="LineNr">165 </span> BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span> +<span id="L163" class="LineNr">163 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"multiply r/m32 into "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L164" class="LineNr">164 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L165" class="LineNr">165 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span> <span id="L166" class="LineNr">166 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span> <span id="L168" class="LineNr">168 </span> @@ -240,26 +240,26 @@ if ('onhashchange' in window) { <span id="L175" class="LineNr">175 </span> f7 db <span class="Comment"># negate EBX</span> <span id="L176" class="LineNr">176 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (subop negate) 011 (dest EBX)</span> <span id="L177" class="LineNr">177 </span><span class="traceContains">+run: operate on r/m32</span> -<span id="L178" class="LineNr">178 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L178" class="LineNr">178 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L179" class="LineNr">179 </span><span class="traceContains">+run: subop: negate</span> <span id="L180" class="LineNr">180 </span><span class="traceContains">+run: storing 0xffffffff</span> <span id="L181" class="LineNr">181 </span> <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(before "End Op f7 Subops")</span> <span id="L183" class="LineNr">183 </span><span class="Normal">case</span> <span class="Constant">3</span>: <span class="Delimiter">{</span> <span class="Comment">// negate r/m32</span> -<span id="L184" class="LineNr">184 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop: negate"</span> << end<span class="Delimiter">();</span> +<span id="L184" class="LineNr">184 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop: negate"</span> << end<span class="Delimiter">();</span> <span id="L185" class="LineNr">185 </span> <span class="Comment">// one case that can overflow</span> <span id="L186" class="LineNr">186 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span>*arg1<span class="Delimiter">)</span> == <span class="Constant">0x80000000</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L187" class="LineNr">187 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"overflow"</span> << end<span class="Delimiter">();</span> +<span id="L187" class="LineNr">187 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"overflow"</span> << end<span class="Delimiter">();</span> <span id="L188" class="LineNr">188 </span> SF =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L189" class="LineNr">189 </span> ZF =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L190" class="LineNr">190 </span> OF =<span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L190" class="LineNr">190 </span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L191" class="LineNr">191 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L192" class="LineNr">192 </span> <span class="Delimiter">}</span> <span id="L193" class="LineNr">193 </span> *arg1 = -<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span> -<span id="L194" class="LineNr">194 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << *arg1 << end<span class="Delimiter">();</span> +<span id="L194" class="LineNr">194 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *arg1 << end<span class="Delimiter">();</span> <span id="L195" class="LineNr">195 </span> SF = <span class="Delimiter">(</span>*arg1 >> <span class="Constant">31</span><span class="Delimiter">);</span> <span id="L196" class="LineNr">196 </span> ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L197" class="LineNr">197 </span> OF =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L197" class="LineNr">197 </span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L198" class="LineNr">198 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L199" class="LineNr">199 </span><span class="Delimiter">}</span> <span id="L200" class="LineNr">200 </span> @@ -270,14 +270,14 @@ if ('onhashchange' in window) { <span id="L205" class="LineNr">205 </span> f7 db <span class="Comment"># negate EBX</span> <span id="L206" class="LineNr">206 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (subop negate) 011 (dest EBX)</span> <span id="L207" class="LineNr">207 </span><span class="traceContains">+run: operate on r/m32</span> -<span id="L208" class="LineNr">208 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L208" class="LineNr">208 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L209" class="LineNr">209 </span><span class="traceContains">+run: subop: negate</span> <span id="L210" class="LineNr">210 </span><span class="traceContains">+run: overflow</span> <span id="L211" class="LineNr">211 </span> <span id="L212" class="LineNr">212 </span><span class="SalientComment">//:: and</span> <span id="L213" class="LineNr">213 </span> <span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L215" class="LineNr">215 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"21"</span><span class="Delimiter">,</span> <span class="Constant">"rm32 = bitwise AND of r32 with rm32 (and)"</span><span class="Delimiter">);</span> +<span id="L215" class="LineNr">215 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"21"</span><span class="Delimiter">,</span> <span class="Constant">"rm32 = bitwise AND of r32 with rm32 (and)"</span><span class="Delimiter">);</span> <span id="L216" class="LineNr">216 </span> <span id="L217" class="LineNr">217 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span> <span id="L218" class="LineNr">218 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span> @@ -286,24 +286,24 @@ if ('onhashchange' in window) { <span id="L221" class="LineNr">221 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L222" class="LineNr">222 </span> <span class="Constant">21</span> d8 <span class="Comment"># and EBX with destination EAX</span> <span id="L223" class="LineNr">223 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: and EBX with r/m32</span> -<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L226" class="LineNr">226 </span><span class="traceContains">+run: storing 0x0000000d</span> <span id="L227" class="LineNr">227 </span> <span id="L228" class="LineNr">228 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L229" class="LineNr">229 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span> <span class="Comment">// and r32 with r/m32</span> -<span id="L230" class="LineNr">230 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L230" class="LineNr">230 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L231" class="LineNr">231 </span> <span class="Normal">const</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="L232" class="LineNr">232 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"and "</span> << rname<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L233" class="LineNr">233 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L234" class="LineNr">234 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>&<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L232" class="LineNr">232 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"and "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L233" class="LineNr">233 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L234" class="LineNr">234 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> <span id="L235" class="LineNr">235 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span> <span id="L237" class="LineNr">237 </span> <span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: or</span> <span id="L239" class="LineNr">239 </span> <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L241" class="LineNr">241 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"09"</span><span class="Delimiter">,</span> <span class="Constant">"rm32 = bitwise OR of r32 with rm32 (or)"</span><span class="Delimiter">);</span> +<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"09"</span><span class="Delimiter">,</span> <span class="Constant">"rm32 = bitwise OR of r32 with rm32 (or)"</span><span class="Delimiter">);</span> <span id="L242" class="LineNr">242 </span> <span id="L243" class="LineNr">243 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span> <span id="L244" class="LineNr">244 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span> @@ -312,24 +312,24 @@ if ('onhashchange' in window) { <span id="L247" class="LineNr">247 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L248" class="LineNr">248 </span> <span class="Error">09</span> d8 <span class="Comment"># or EBX with destination EAX</span> <span id="L249" class="LineNr">249 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: or EBX with r/m32</span> -<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L252" class="LineNr">252 </span><span class="traceContains">+run: storing 0xaabbccdd</span> <span id="L253" class="LineNr">253 </span> <span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L255" class="LineNr">255 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span> <span class="Comment">// or r32 with r/m32</span> -<span id="L256" class="LineNr">256 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L256" class="LineNr">256 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L257" class="LineNr">257 </span> <span class="Normal">const</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="L258" class="LineNr">258 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"or "</span> << rname<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L259" class="LineNr">259 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L260" class="LineNr">260 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L258" class="LineNr">258 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"or "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L259" class="LineNr">259 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L260" class="LineNr">260 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> <span id="L261" class="LineNr">261 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L262" class="LineNr">262 </span><span class="Delimiter">}</span> <span id="L263" class="LineNr">263 </span> <span id="L264" class="LineNr">264 </span><span class="SalientComment">//:: xor</span> <span id="L265" class="LineNr">265 </span> <span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L267" class="LineNr">267 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"31"</span><span class="Delimiter">,</span> <span class="Constant">"rm32 = bitwise XOR of r32 with rm32 (xor)"</span><span class="Delimiter">);</span> +<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"31"</span><span class="Delimiter">,</span> <span class="Constant">"rm32 = bitwise XOR of r32 with rm32 (xor)"</span><span class="Delimiter">);</span> <span id="L268" class="LineNr">268 </span> <span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span> <span id="L270" class="LineNr">270 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span> @@ -338,17 +338,17 @@ if ('onhashchange' in window) { <span id="L273" class="LineNr">273 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L274" class="LineNr">274 </span> <span class="Constant">31</span> d8 <span class="Comment"># xor EBX with destination EAX</span> <span id="L275" class="LineNr">275 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: xor EBX with r/m32</span> -<span id="L277" class="LineNr">277 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L277" class="LineNr">277 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L278" class="LineNr">278 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span> <span id="L279" class="LineNr">279 </span> <span id="L280" class="LineNr">280 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L281" class="LineNr">281 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span> <span class="Comment">// xor r32 with r/m32</span> -<span id="L282" class="LineNr">282 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L282" class="LineNr">282 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L283" class="LineNr">283 </span> <span class="Normal">const</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="L284" class="LineNr">284 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"xor "</span> << rname<span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L285" class="LineNr">285 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L286" class="LineNr">286 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L284" class="LineNr">284 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"xor "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L285" class="LineNr">285 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L286" class="LineNr">286 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> <span id="L287" class="LineNr">287 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L288" class="LineNr">288 </span><span class="Delimiter">}</span> <span id="L289" class="LineNr">289 </span> @@ -361,25 +361,25 @@ if ('onhashchange' in window) { <span id="L296" class="LineNr">296 </span> f7 d3 <span class="Comment"># not EBX</span> <span id="L297" class="LineNr">297 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span> <span id="L298" class="LineNr">298 </span><span class="traceContains">+run: operate on r/m32</span> -<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L300" class="LineNr">300 </span><span class="traceContains">+run: subop: not</span> <span id="L301" class="LineNr">301 </span><span class="traceContains">+run: storing 0xf0f0ff00</span> <span id="L302" class="LineNr">302 </span> <span id="L303" class="LineNr">303 </span><span class="Delimiter">:(before "End Op f7 Subops")</span> <span id="L304" class="LineNr">304 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span> <span class="Comment">// not r/m32</span> -<span id="L305" class="LineNr">305 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop: not"</span> << end<span class="Delimiter">();</span> +<span id="L305" class="LineNr">305 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop: not"</span> << end<span class="Delimiter">();</span> <span id="L306" class="LineNr">306 </span> *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span> -<span id="L307" class="LineNr">307 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << *arg1 << end<span class="Delimiter">();</span> +<span id="L307" class="LineNr">307 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *arg1 << end<span class="Delimiter">();</span> <span id="L308" class="LineNr">308 </span> SF = <span class="Delimiter">(</span>*arg1 >> <span class="Constant">31</span><span class="Delimiter">);</span> <span id="L309" class="LineNr">309 </span> ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L310" class="LineNr">310 </span> OF =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L310" class="LineNr">310 </span> <a href='010---vm.cc.html#L81'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L311" class="LineNr">311 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L312" class="LineNr">312 </span><span class="Delimiter">}</span> <span id="L313" class="LineNr">313 </span> <span id="L314" class="LineNr">314 </span><span class="SalientComment">//:: compare (cmp)</span> <span id="L315" class="LineNr">315 </span> <span id="L316" class="LineNr">316 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L317" class="LineNr">317 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"39"</span><span class="Delimiter">,</span> <span class="Constant">"compare: set SF if rm32 < r32 (cmp)"</span><span class="Delimiter">);</span> +<span id="L317" class="LineNr">317 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"39"</span><span class="Delimiter">,</span> <span class="Constant">"compare: set SF if rm32 < r32 (cmp)"</span><span class="Delimiter">);</span> <span id="L318" class="LineNr">318 </span> <span id="L319" class="LineNr">319 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span> <span id="L320" class="LineNr">320 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span> @@ -388,23 +388,23 @@ if ('onhashchange' in window) { <span id="L323" class="LineNr">323 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L324" class="LineNr">324 </span> <span class="Constant">39</span> d8 <span class="Comment"># compare EBX with EAX</span> <span id="L325" class="LineNr">325 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: compare EBX with r/m32</span> -<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L328" class="LineNr">328 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span> <span id="L329" class="LineNr">329 </span> <span id="L330" class="LineNr">330 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L331" class="LineNr">331 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span> <span class="Comment">// set SF if r/m32 < r32</span> -<span id="L332" class="LineNr">332 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L332" class="LineNr">332 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L333" class="LineNr">333 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <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="L334" class="LineNr">334 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"compare "</span> << rname<span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L335" class="LineNr">335 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L334" class="LineNr">334 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"compare "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L335" class="LineNr">335 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L336" class="LineNr">336 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> <span id="L337" class="LineNr">337 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span> <span id="L338" class="LineNr">338 </span> SF = <span class="Delimiter">(</span>tmp1 < <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L339" class="LineNr">339 </span> ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L340" class="LineNr">340 </span> <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span> -<span id="L341" class="LineNr">341 </span> OF = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> -<span id="L342" class="LineNr">342 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << OF << end<span class="Delimiter">();</span> +<span id="L341" class="LineNr">341 </span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> +<span id="L342" class="LineNr">342 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << <a href='010---vm.cc.html#L81'>OF</a> << end<span class="Delimiter">();</span> <span id="L343" class="LineNr">343 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span> <span id="L345" class="LineNr">345 </span> @@ -415,8 +415,8 @@ if ('onhashchange' in window) { <span id="L350" class="LineNr">350 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L351" class="LineNr">351 </span> <span class="Constant">39</span> d8 <span class="Comment"># compare EBX with EAX</span> <span id="L352" class="LineNr">352 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: compare EBX with r/m32</span> -<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L355" class="LineNr">355 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span> <span id="L356" class="LineNr">356 </span> <span id="L357" class="LineNr">357 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span> @@ -426,14 +426,14 @@ if ('onhashchange' in window) { <span id="L361" class="LineNr">361 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L362" class="LineNr">362 </span> <span class="Constant">39</span> d8 <span class="Comment"># compare EBX with EAX</span> <span id="L363" class="LineNr">363 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L364" class="LineNr">364 </span><span class="traceContains">+run: compare EBX with r/m32</span> -<span id="L365" class="LineNr">365 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L364" class="LineNr">364 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L365" class="LineNr">365 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L366" class="LineNr">366 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span> <span id="L367" class="LineNr">367 </span> <span id="L368" class="LineNr">368 </span><span class="SalientComment">//:: copy (mov)</span> <span id="L369" class="LineNr">369 </span> <span id="L370" class="LineNr">370 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L371" class="LineNr">371 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"89"</span><span class="Delimiter">,</span> <span class="Constant">"copy r32 to rm32 (mov)"</span><span class="Delimiter">);</span> +<span id="L371" class="LineNr">371 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"89"</span><span class="Delimiter">,</span> <span class="Constant">"copy r32 to rm32 (mov)"</span><span class="Delimiter">);</span> <span id="L372" class="LineNr">372 </span> <span id="L373" class="LineNr">373 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span> <span id="L374" class="LineNr">374 </span><span class="Special">% Reg[EBX].i = 0xaf;</span> @@ -441,25 +441,25 @@ if ('onhashchange' in window) { <span id="L376" class="LineNr">376 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L377" class="LineNr">377 </span> <span class="Constant">89</span> d8 <span class="Comment"># copy EBX to EAX</span> <span id="L378" class="LineNr">378 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: copy EBX to r/m32</span> -<span id="L380" class="LineNr">380 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> +<span id="L380" class="LineNr">380 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L381" class="LineNr">381 </span><span class="traceContains">+run: storing 0x000000af</span> <span id="L382" class="LineNr">382 </span> <span id="L383" class="LineNr">383 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L384" class="LineNr">384 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span> <span class="Comment">// copy r32 to r/m32</span> -<span id="L385" class="LineNr">385 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L385" class="LineNr">385 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L386" class="LineNr">386 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <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="L387" class="LineNr">387 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy "</span> << rname<span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> << <span class="Constant">" to r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L388" class="LineNr">388 </span> <span class="Normal">int32_t</span>* dest = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L387" class="LineNr">387 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> << <span class="Constant">" to r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L388" class="LineNr">388 </span> <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L389" class="LineNr">389 </span> *dest = Reg[rsrc]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> -<span id="L390" class="LineNr">390 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << *dest << end<span class="Delimiter">();</span> +<span id="L390" class="LineNr">390 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *dest << end<span class="Delimiter">();</span> <span id="L391" class="LineNr">391 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L392" class="LineNr">392 </span><span class="Delimiter">}</span> <span id="L393" class="LineNr">393 </span> <span id="L394" class="LineNr">394 </span><span class="SalientComment">//:: xchg</span> <span id="L395" class="LineNr">395 </span> <span id="L396" class="LineNr">396 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L397" class="LineNr">397 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"87"</span><span class="Delimiter">,</span> <span class="Constant">"swap the contents of r32 and rm32 (xchg)"</span><span class="Delimiter">);</span> +<span id="L397" class="LineNr">397 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"87"</span><span class="Delimiter">,</span> <span class="Constant">"swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32 (xchg)"</span><span class="Delimiter">);</span> <span id="L398" class="LineNr">398 </span> <span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span> <span id="L400" class="LineNr">400 </span><span class="Special">% Reg[EBX].i = 0xaf;</span> @@ -468,43 +468,43 @@ if ('onhashchange' in window) { <span id="L403" class="LineNr">403 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L404" class="LineNr">404 </span> <span class="Constant">87</span> d8 <span class="Comment"># exchange EBX with EAX</span> <span id="L405" class="LineNr">405 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span> -<span id="L406" class="LineNr">406 </span><span class="traceContains">+run: exchange EBX with r/m32</span> -<span id="L407" class="LineNr">407 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L406" class="LineNr">406 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> +<span id="L407" class="LineNr">407 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L408" class="LineNr">408 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span> -<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: storing 0x0000002e in EBX</span> +<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L410" class="LineNr">410 </span> <span id="L411" class="LineNr">411 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L412" class="LineNr">412 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span> <span class="Comment">// exchange r32 with r/m32</span> -<span id="L413" class="LineNr">413 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L413" class="LineNr">413 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L414" class="LineNr">414 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg2 = <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="L415" class="LineNr">415 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"exchange "</span> << rname<span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L416" class="LineNr">416 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L415" class="LineNr">415 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"exchange "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> << <span class="Constant">" with r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L416" class="LineNr">416 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L417" class="LineNr">417 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span> <span id="L418" class="LineNr">418 </span> *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> <span id="L419" class="LineNr">419 </span> Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span> -<span id="L420" class="LineNr">420 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << *arg1 << <span class="Constant">" in r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L421" class="LineNr">421 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << Reg[reg2]<span class="Delimiter">.</span>i << <span class="Constant">" in "</span> << rname<span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L420" class="LineNr">420 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *arg1 << <span class="Constant">" in r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L421" class="LineNr">421 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[reg2]<span class="Delimiter">.</span>i << <span class="Constant">" in "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L422" class="LineNr">422 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L423" class="LineNr">423 </span><span class="Delimiter">}</span> <span id="L424" class="LineNr">424 </span> <span id="L425" class="LineNr">425 </span><span class="SalientComment">//:: increment</span> <span id="L426" class="LineNr">426 </span> <span id="L427" class="LineNr">427 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L428" class="LineNr">428 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"40"</span><span class="Delimiter">,</span> <span class="Constant">"increment EAX (inc)"</span><span class="Delimiter">);</span> -<span id="L429" class="LineNr">429 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"41"</span><span class="Delimiter">,</span> <span class="Constant">"increment ECX (inc)"</span><span class="Delimiter">);</span> -<span id="L430" class="LineNr">430 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"42"</span><span class="Delimiter">,</span> <span class="Constant">"increment EDX (inc)"</span><span class="Delimiter">);</span> -<span id="L431" class="LineNr">431 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"43"</span><span class="Delimiter">,</span> <span class="Constant">"increment EBX (inc)"</span><span class="Delimiter">);</span> -<span id="L432" class="LineNr">432 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"44"</span><span class="Delimiter">,</span> <span class="Constant">"increment ESP (inc)"</span><span class="Delimiter">);</span> -<span id="L433" class="LineNr">433 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"45"</span><span class="Delimiter">,</span> <span class="Constant">"increment EBP (inc)"</span><span class="Delimiter">);</span> -<span id="L434" class="LineNr">434 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"46"</span><span class="Delimiter">,</span> <span class="Constant">"increment ESI (inc)"</span><span class="Delimiter">);</span> -<span id="L435" class="LineNr">435 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"47"</span><span class="Delimiter">,</span> <span class="Constant">"increment EDI (inc)"</span><span class="Delimiter">);</span> +<span id="L428" class="LineNr">428 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"40"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L13'>EAX</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L429" class="LineNr">429 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"41"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L14'>ECX</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L430" class="LineNr">430 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"42"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L15'>EDX</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L431" class="LineNr">431 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"43"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L16'>EBX</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L432" class="LineNr">432 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"44"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L17'>ESP</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"45"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L18'>EBP</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L434" class="LineNr">434 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"46"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L19'>ESI</a> (inc)"</span><span class="Delimiter">);</span> +<span id="L435" class="LineNr">435 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"47"</span><span class="Delimiter">,</span> <span class="Constant">"increment <a href='010---vm.cc.html#L20'>EDI</a> (inc)"</span><span class="Delimiter">);</span> <span id="L436" class="LineNr">436 </span> <span id="L437" class="LineNr">437 </span><span class="Delimiter">:(scenario increment_r32)</span> <span id="L438" class="LineNr">438 </span><span class="Special">% Reg[ECX].u = 0x1f;</span> <span id="L439" class="LineNr">439 </span>== <span class="Constant">0x1</span> <span class="Comment"># code segment</span> <span id="L440" class="LineNr">440 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L441" class="LineNr">441 </span> <span class="Constant">41</span> <span class="Comment"># increment ECX</span> -<span id="L442" class="LineNr">442 </span><span class="traceContains">+run: increment ECX</span> +<span id="L442" class="LineNr">442 </span><span class="traceContains">+run: increment <a href='010---vm.cc.html#L14'>ECX</a></span> <span id="L443" class="LineNr">443 </span><span class="traceContains">+run: storing value 0x00000020</span> <span id="L444" class="LineNr">444 </span> <span id="L445" class="LineNr">445 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> @@ -516,15 +516,15 @@ if ('onhashchange' in window) { <span id="L451" class="LineNr">451 </span><span class="Normal">case</span> <span class="Constant">0x45</span>: <span id="L452" class="LineNr">452 </span><span class="Normal">case</span> <span class="Constant">0x46</span>: <span id="L453" class="LineNr">453 </span><span class="Normal">case</span> <span class="Constant">0x47</span>: <span class="Delimiter">{</span> <span class="Comment">// increment r32</span> -<span id="L454" class="LineNr">454 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L455" class="LineNr">455 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"increment "</span> << rname<span class="Delimiter">(</span>reg<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L454" class="LineNr">454 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> +<span id="L455" class="LineNr">455 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"increment "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L456" class="LineNr">456 </span> ++Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> -<span id="L457" class="LineNr">457 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << HEXWORD << Reg[reg]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L457" class="LineNr">457 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[reg]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L458" class="LineNr">458 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L459" class="LineNr">459 </span><span class="Delimiter">}</span> <span id="L460" class="LineNr">460 </span> <span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L462" class="LineNr">462 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"ff"</span><span class="Delimiter">,</span> <span class="Constant">"increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)"</span><span class="Delimiter">);</span> +<span id="L462" class="LineNr">462 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"ff"</span><span class="Delimiter">,</span> <span class="Constant">"increment/decrement/jump/push/call rm32 based on subop (inc/dec/jmp/push/call)"</span><span class="Delimiter">);</span> <span id="L463" class="LineNr">463 </span> <span id="L464" class="LineNr">464 </span><span class="Delimiter">:(scenario increment_rm32)</span> <span id="L465" class="LineNr">465 </span><span class="Special">% Reg[EAX].u = 0x20;</span> @@ -533,24 +533,24 @@ if ('onhashchange' in window) { <span id="L468" class="LineNr">468 </span> ff c0 <span class="Comment"># increment EAX</span> <span id="L469" class="LineNr">469 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (subop inc) 000 (EAX)</span> <span id="L470" class="LineNr">470 </span><span class="traceContains">+run: increment r/m32</span> -<span id="L471" class="LineNr">471 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L471" class="LineNr">471 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L472" class="LineNr">472 </span><span class="traceContains">+run: storing value 0x00000021</span> <span id="L473" class="LineNr">473 </span> <span id="L474" class="LineNr">474 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L475" class="LineNr">475 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span> -<span id="L476" class="LineNr">476 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L476" class="LineNr">476 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L477" class="LineNr">477 </span> <span class="Normal">const</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="L478" class="LineNr">478 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L479" class="LineNr">479 </span> <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span> <span class="Comment">// increment r/m32</span> -<span id="L480" class="LineNr">480 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"increment r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L481" class="LineNr">481 </span> <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L480" class="LineNr">480 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"increment r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L481" class="LineNr">481 </span> <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L482" class="LineNr">482 </span> ++*arg<span class="Delimiter">;</span> -<span id="L483" class="LineNr">483 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << HEXWORD << *arg << end<span class="Delimiter">();</span> +<span id="L483" class="LineNr">483 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *arg << end<span class="Delimiter">();</span> <span id="L484" class="LineNr">484 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L485" class="LineNr">485 </span> <span class="Delimiter">}</span> <span id="L486" class="LineNr">486 </span> <span class="Normal">default</span>: -<span id="L487" class="LineNr">487 </span> cerr << <span class="Constant">"unrecognized subop for ff: "</span> << HEXBYTE << NUM<span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L488" class="LineNr">488 </span> DUMP<span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> +<span id="L487" class="LineNr">487 </span> cerr << <span class="Constant">"unrecognized subop for ff: "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L488" class="LineNr">488 </span> <a href='003trace.cc.html#L207'>DUMP</a><span class="Delimiter">(</span><span class="Constant">""</span><span class="Delimiter">);</span> <span id="L489" class="LineNr">489 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L490" class="LineNr">490 </span> <span class="Comment">// End Op ff Subops</span> <span id="L491" class="LineNr">491 </span> <span class="Delimiter">}</span> @@ -560,21 +560,21 @@ if ('onhashchange' in window) { <span id="L495" class="LineNr">495 </span><span class="SalientComment">//:: decrement</span> <span id="L496" class="LineNr">496 </span> <span id="L497" class="LineNr">497 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L498" class="LineNr">498 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"48"</span><span class="Delimiter">,</span> <span class="Constant">"decrement EAX (dec)"</span><span class="Delimiter">);</span> -<span id="L499" class="LineNr">499 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"49"</span><span class="Delimiter">,</span> <span class="Constant">"decrement ECX (dec)"</span><span class="Delimiter">);</span> -<span id="L500" class="LineNr">500 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"4a"</span><span class="Delimiter">,</span> <span class="Constant">"decrement EDX (dec)"</span><span class="Delimiter">);</span> -<span id="L501" class="LineNr">501 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"4b"</span><span class="Delimiter">,</span> <span class="Constant">"decrement EBX (dec)"</span><span class="Delimiter">);</span> -<span id="L502" class="LineNr">502 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"4c"</span><span class="Delimiter">,</span> <span class="Constant">"decrement ESP (dec)"</span><span class="Delimiter">);</span> -<span id="L503" class="LineNr">503 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"4d"</span><span class="Delimiter">,</span> <span class="Constant">"decrement EBP (dec)"</span><span class="Delimiter">);</span> -<span id="L504" class="LineNr">504 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"4e"</span><span class="Delimiter">,</span> <span class="Constant">"decrement ESI (dec)"</span><span class="Delimiter">);</span> -<span id="L505" class="LineNr">505 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"4f"</span><span class="Delimiter">,</span> <span class="Constant">"decrement EDI (dec)"</span><span class="Delimiter">);</span> +<span id="L498" class="LineNr">498 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"48"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L13'>EAX</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L499" class="LineNr">499 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"49"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L14'>ECX</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L500" class="LineNr">500 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"4a"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L15'>EDX</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L501" class="LineNr">501 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"4b"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L16'>EBX</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L502" class="LineNr">502 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"4c"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L17'>ESP</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L503" class="LineNr">503 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"4d"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L18'>EBP</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L504" class="LineNr">504 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"4e"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L19'>ESI</a> (dec)"</span><span class="Delimiter">);</span> +<span id="L505" class="LineNr">505 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"4f"</span><span class="Delimiter">,</span> <span class="Constant">"decrement <a href='010---vm.cc.html#L20'>EDI</a> (dec)"</span><span class="Delimiter">);</span> <span id="L506" class="LineNr">506 </span> <span id="L507" class="LineNr">507 </span><span class="Delimiter">:(scenario decrement_r32)</span> <span id="L508" class="LineNr">508 </span><span class="Special">% Reg[ECX].u = 0x1f;</span> <span id="L509" class="LineNr">509 </span>== <span class="Constant">0x1</span> <span class="Comment"># code segment</span> <span id="L510" class="LineNr">510 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L511" class="LineNr">511 </span> <span class="Constant">49</span> <span class="Comment"># decrement ECX</span> -<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: decrement ECX</span> +<span id="L512" class="LineNr">512 </span><span class="traceContains">+run: decrement <a href='010---vm.cc.html#L14'>ECX</a></span> <span id="L513" class="LineNr">513 </span><span class="traceContains">+run: storing value 0x0000001e</span> <span id="L514" class="LineNr">514 </span> <span id="L515" class="LineNr">515 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> @@ -586,10 +586,10 @@ if ('onhashchange' in window) { <span id="L521" class="LineNr">521 </span><span class="Normal">case</span> <span class="Constant">0x4d</span>: <span id="L522" class="LineNr">522 </span><span class="Normal">case</span> <span class="Constant">0x4e</span>: <span id="L523" class="LineNr">523 </span><span class="Normal">case</span> <span class="Constant">0x4f</span>: <span class="Delimiter">{</span> <span class="Comment">// decrement r32</span> -<span id="L524" class="LineNr">524 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L525" class="LineNr">525 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"decrement "</span> << rname<span class="Delimiter">(</span>reg<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L524" class="LineNr">524 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> +<span id="L525" class="LineNr">525 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"decrement "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L526" class="LineNr">526 </span> --Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> -<span id="L527" class="LineNr">527 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << HEXWORD << Reg[reg]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L527" class="LineNr">527 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[reg]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L528" class="LineNr">528 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L529" class="LineNr">529 </span><span class="Delimiter">}</span> <span id="L530" class="LineNr">530 </span> @@ -600,29 +600,29 @@ if ('onhashchange' in window) { <span id="L535" class="LineNr">535 </span> ff c8 <span class="Comment"># decrement EAX</span> <span id="L536" class="LineNr">536 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (subop inc) 000 (EAX)</span> <span id="L537" class="LineNr">537 </span><span class="traceContains">+run: decrement r/m32</span> -<span id="L538" class="LineNr">538 </span><span class="traceContains">+run: r/m32 is EAX</span> +<span id="L538" class="LineNr">538 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L539" class="LineNr">539 </span><span class="traceContains">+run: storing value 0x0000001f</span> <span id="L540" class="LineNr">540 </span> <span id="L541" class="LineNr">541 </span><span class="Delimiter">:(before "End Op ff Subops")</span> <span id="L542" class="LineNr">542 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span> <span class="Comment">// decrement r/m32</span> -<span id="L543" class="LineNr">543 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"decrement r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L544" class="LineNr">544 </span> <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L543" class="LineNr">543 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"decrement r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L544" class="LineNr">544 </span> <span class="Normal">int32_t</span>* <a href='001help.cc.html#L15'>arg</a> = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L545" class="LineNr">545 </span> --*arg<span class="Delimiter">;</span> -<span id="L546" class="LineNr">546 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << HEXWORD << *arg << end<span class="Delimiter">();</span> +<span id="L546" class="LineNr">546 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing value 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *arg << end<span class="Delimiter">();</span> <span id="L547" class="LineNr">547 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L548" class="LineNr">548 </span><span class="Delimiter">}</span> <span id="L549" class="LineNr">549 </span> <span id="L550" class="LineNr">550 </span><span class="SalientComment">//:: push</span> <span id="L551" class="LineNr">551 </span> <span id="L552" class="LineNr">552 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L553" class="LineNr">553 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"50"</span><span class="Delimiter">,</span> <span class="Constant">"push EAX to stack (push)"</span><span class="Delimiter">);</span> -<span id="L554" class="LineNr">554 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"51"</span><span class="Delimiter">,</span> <span class="Constant">"push ECX to stack (push)"</span><span class="Delimiter">);</span> -<span id="L555" class="LineNr">555 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"52"</span><span class="Delimiter">,</span> <span class="Constant">"push EDX to stack (push)"</span><span class="Delimiter">);</span> -<span id="L556" class="LineNr">556 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"53"</span><span class="Delimiter">,</span> <span class="Constant">"push EBX to stack (push)"</span><span class="Delimiter">);</span> -<span id="L557" class="LineNr">557 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"54"</span><span class="Delimiter">,</span> <span class="Constant">"push ESP to stack (push)"</span><span class="Delimiter">);</span> -<span id="L558" class="LineNr">558 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"55"</span><span class="Delimiter">,</span> <span class="Constant">"push EBP to stack (push)"</span><span class="Delimiter">);</span> -<span id="L559" class="LineNr">559 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"56"</span><span class="Delimiter">,</span> <span class="Constant">"push ESI to stack (push)"</span><span class="Delimiter">);</span> -<span id="L560" class="LineNr">560 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"57"</span><span class="Delimiter">,</span> <span class="Constant">"push EDI to stack (push)"</span><span class="Delimiter">);</span> +<span id="L553" class="LineNr">553 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"50"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L13'>EAX</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L554" class="LineNr">554 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"51"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L14'>ECX</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L555" class="LineNr">555 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"52"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L15'>EDX</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L556" class="LineNr">556 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"53"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L16'>EBX</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L557" class="LineNr">557 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"54"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L17'>ESP</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L558" class="LineNr">558 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"55"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L18'>EBP</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L559" class="LineNr">559 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"56"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L19'>ESI</a> to stack (push)"</span><span class="Delimiter">);</span> +<span id="L560" class="LineNr">560 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"57"</span><span class="Delimiter">,</span> <span class="Constant">"push <a href='010---vm.cc.html#L20'>EDI</a> to stack (push)"</span><span class="Delimiter">);</span> <span id="L561" class="LineNr">561 </span> <span id="L562" class="LineNr">562 </span><span class="Delimiter">:(scenario push_r32)</span> <span id="L563" class="LineNr">563 </span><span class="Special">% Reg[ESP].u = 0x64;</span> @@ -630,8 +630,8 @@ if ('onhashchange' in window) { <span id="L565" class="LineNr">565 </span>== <span class="Constant">0x1</span> <span id="L566" class="LineNr">566 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L567" class="LineNr">567 </span> <span class="Constant">53</span> <span class="Comment"># push EBX to stack</span> -<span id="L568" class="LineNr">568 </span><span class="traceContains">+run: push EBX</span> -<span id="L569" class="LineNr">569 </span><span class="traceContains">+run: decrementing ESP to 0x00000060</span> +<span id="L568" class="LineNr">568 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span> +<span id="L569" class="LineNr">569 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span> <span id="L570" class="LineNr">570 </span><span class="traceContains">+run: pushing value 0x0000000a</span> <span id="L571" class="LineNr">571 </span> <span id="L572" class="LineNr">572 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> @@ -643,24 +643,24 @@ if ('onhashchange' in window) { <span id="L578" class="LineNr">578 </span><span class="Normal">case</span> <span class="Constant">0x55</span>: <span id="L579" class="LineNr">579 </span><span class="Normal">case</span> <span class="Constant">0x56</span>: <span id="L580" class="LineNr">580 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span> <span class="Comment">// push r32 to stack</span> -<span id="L581" class="LineNr">581 </span> <span class="Normal">uint8_t</span> reg = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L582" class="LineNr">582 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"push "</span> << rname<span class="Delimiter">(</span>reg<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L581" class="LineNr">581 </span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> +<span id="L582" class="LineNr">582 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"push "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L583" class="LineNr">583 </span><span class="CommentedCode">//? cerr << "push: " << NUM(reg) << ": " << Reg[reg].u << " => " << Reg[ESP].u << '\n';</span> -<span id="L584" class="LineNr">584 </span> push<span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L584" class="LineNr">584 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> <span id="L585" class="LineNr">585 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L586" class="LineNr">586 </span><span class="Delimiter">}</span> <span id="L587" class="LineNr">587 </span> <span id="L588" class="LineNr">588 </span><span class="SalientComment">//:: pop</span> <span id="L589" class="LineNr">589 </span> <span id="L590" class="LineNr">590 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L591" class="LineNr">591 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"58"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to EAX (pop)"</span><span class="Delimiter">);</span> -<span id="L592" class="LineNr">592 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"59"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to ECX (pop)"</span><span class="Delimiter">);</span> -<span id="L593" class="LineNr">593 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"5a"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to EDX (pop)"</span><span class="Delimiter">);</span> -<span id="L594" class="LineNr">594 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"5b"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to EBX (pop)"</span><span class="Delimiter">);</span> -<span id="L595" class="LineNr">595 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"5c"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to ESP (pop)"</span><span class="Delimiter">);</span> -<span id="L596" class="LineNr">596 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"5d"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to EBP (pop)"</span><span class="Delimiter">);</span> -<span id="L597" class="LineNr">597 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"5e"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to ESI (pop)"</span><span class="Delimiter">);</span> -<span id="L598" class="LineNr">598 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"5f"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to EDI (pop)"</span><span class="Delimiter">);</span> +<span id="L591" class="LineNr">591 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"58"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L13'>EAX</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L592" class="LineNr">592 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"59"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L14'>ECX</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L593" class="LineNr">593 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"5a"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L15'>EDX</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L594" class="LineNr">594 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"5b"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L16'>EBX</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L595" class="LineNr">595 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"5c"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L17'>ESP</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L596" class="LineNr">596 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"5d"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L18'>EBP</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L597" class="LineNr">597 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"5e"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L19'>ESI</a> (pop)"</span><span class="Delimiter">);</span> +<span id="L598" class="LineNr">598 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"5f"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to <a href='010---vm.cc.html#L20'>EDI</a> (pop)"</span><span class="Delimiter">);</span> <span id="L599" class="LineNr">599 </span> <span id="L600" class="LineNr">600 </span><span class="Delimiter">:(scenario pop_r32)</span> <span id="L601" class="LineNr">601 </span><span class="Special">% Reg[ESP].u = 0x2000;</span> @@ -671,9 +671,9 @@ if ('onhashchange' in window) { <span id="L606" class="LineNr">606 </span> 5b <span class="Comment"># pop stack to EBX</span> <span id="L607" class="LineNr">607 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L608" class="LineNr">608 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 0x0a</span> -<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: pop into EBX</span> +<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L630'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L610" class="LineNr">610 </span><span class="traceContains">+run: popping value 0x0000000a</span> -<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: incrementing ESP to 0x00002004</span> +<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span> <span id="L612" class="LineNr">612 </span> <span id="L613" class="LineNr">613 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L614" class="LineNr">614 </span><span class="Normal">case</span> <span class="Constant">0x58</span>: @@ -684,19 +684,19 @@ if ('onhashchange' in window) { <span id="L619" class="LineNr">619 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>: <span id="L620" class="LineNr">620 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>: <span id="L621" class="LineNr">621 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span> <span class="Comment">// pop stack into r32</span> -<span id="L622" class="LineNr">622 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L623" class="LineNr">623 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"pop into "</span> << rname<span class="Delimiter">(</span>reg<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L622" class="LineNr">622 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> +<span id="L623" class="LineNr">623 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"pop into "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L624" class="LineNr">624 </span><span class="CommentedCode">//? cerr << "pop from " << Reg[ESP].u << '\n';</span> -<span id="L625" class="LineNr">625 </span> Reg[reg]<span class="Delimiter">.</span>u = pop<span class="Delimiter">();</span> +<span id="L625" class="LineNr">625 </span> Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">();</span> <span id="L626" class="LineNr">626 </span><span class="CommentedCode">//? cerr << "=> " << NUM(reg) << ": " << Reg[reg].u << '\n';</span> <span id="L627" class="LineNr">627 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L628" class="LineNr">628 </span><span class="Delimiter">}</span> <span id="L629" class="LineNr">629 </span><span class="Delimiter">:(code)</span> -<span id="L630" class="LineNr">630 </span><span class="Normal">uint32_t</span> pop<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L631" class="LineNr">631 </span> <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = read_mem_u32<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> -<span id="L632" class="LineNr">632 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"popping value 0x"</span> << HEXWORD << result << end<span class="Delimiter">();</span> +<span id="L630" class="LineNr">630 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L631" class="LineNr">631 </span> <span class="Normal">const</span> <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L632" class="LineNr">632 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"popping value 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << result << end<span class="Delimiter">();</span> <span id="L633" class="LineNr">633 </span> Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span> -<span id="L634" class="LineNr">634 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"incrementing ESP to 0x"</span> << HEXWORD << Reg[ESP]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L634" class="LineNr">634 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[ESP]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L635" class="LineNr">635 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L636" class="LineNr">636 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html index f00ba3a6..483baa73 100644 --- a/html/subx/014indirect_addressing.cc.html +++ b/html/subx/014indirect_addressing.cc.html @@ -74,7 +74,7 @@ if ('onhashchange' in window) { <span id="L10" class="LineNr"> 10 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L11" class="LineNr"> 11 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L12" class="LineNr"> 12 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x00000011</span> <span id="L16" class="LineNr"> 16 </span> @@ -82,7 +82,7 @@ if ('onhashchange' in window) { <span id="L18" class="LineNr"> 18 </span><span class="Normal">case</span> <span class="Constant">0</span>: <span class="Comment">// indirect addressing</span> <span id="L19" class="LineNr"> 19 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L20" class="LineNr"> 20 </span> <span class="Normal">default</span>: <span class="Comment">// address in register</span> -<span id="L21" class="LineNr"> 21 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << HEXWORD << Reg[rm]<span class="Delimiter">.</span>u << <span class="Constant">" ("</span> << rname<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> +<span id="L21" class="LineNr"> 21 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[rm]<span class="Delimiter">.</span>u << <span class="Constant">" ("</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> <span id="L22" class="LineNr"> 22 </span> addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> <span id="L23" class="LineNr"> 23 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L24" class="LineNr"> 24 </span> <span class="Comment">// End Mod 0 Special-cases(addr)</span> @@ -92,7 +92,7 @@ if ('onhashchange' in window) { <span id="L28" class="LineNr"> 28 </span><span class="Comment">//:</span> <span id="L29" class="LineNr"> 29 </span> <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L31" class="LineNr"> 31 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"03"</span><span class="Delimiter">,</span> <span class="Constant">"add rm32 to r32 (add)"</span><span class="Delimiter">);</span> +<span id="L31" class="LineNr"> 31 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"03"</span><span class="Delimiter">,</span> <span class="Constant">"add rm32 to r32 (add)"</span><span class="Delimiter">);</span> <span id="L32" class="LineNr"> 32 </span> <span id="L33" class="LineNr"> 33 </span><span class="Delimiter">:(scenario add_mem_at_r32_to_r32)</span> <span id="L34" class="LineNr"> 34 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -103,17 +103,17 @@ if ('onhashchange' in window) { <span id="L39" class="LineNr"> 39 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L40" class="LineNr"> 40 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L41" class="LineNr"> 41 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L42" class="LineNr"> 42 </span><span class="traceContains">+run: add r/m32 to EBX</span> +<span id="L42" class="LineNr"> 42 </span><span class="traceContains">+run: add r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L43" class="LineNr"> 43 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L44" class="LineNr"> 44 </span><span class="traceContains">+run: storing 0x00000011</span> <span id="L45" class="LineNr"> 45 </span> <span id="L46" class="LineNr"> 46 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L47" class="LineNr"> 47 </span><span class="Normal">case</span> <span class="Constant">0x03</span>: <span class="Delimiter">{</span> <span class="Comment">// add r/m32 to r32</span> -<span id="L48" class="LineNr"> 48 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L48" class="LineNr"> 48 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L49" class="LineNr"> 49 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L50" class="LineNr"> 50 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add r/m32 to "</span> << rname<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L51" class="LineNr"> 51 </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="L52" class="LineNr"> 52 </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="L50" class="LineNr"> 50 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"add r/m32 to "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L51" class="LineNr"> 51 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L52" class="LineNr"> 52 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> <span id="L53" class="LineNr"> 53 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L54" class="LineNr"> 54 </span><span class="Delimiter">}</span> <span id="L55" class="LineNr"> 55 </span> @@ -128,14 +128,14 @@ if ('onhashchange' in window) { <span id="L64" class="LineNr"> 64 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L65" class="LineNr"> 65 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L66" class="LineNr"> 66 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 10</span> -<span id="L67" class="LineNr"> 67 </span><span class="traceContains">+run: subtract EBX from r/m32</span> +<span id="L67" class="LineNr"> 67 </span><span class="traceContains">+run: subtract <a href='010---vm.cc.html#L16'>EBX</a> from r/m32</span> <span id="L68" class="LineNr"> 68 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L69" class="LineNr"> 69 </span><span class="traceContains">+run: storing 0x00000009</span> <span id="L70" class="LineNr"> 70 </span> <span id="L71" class="LineNr"> 71 </span><span class="Comment">//:</span> <span id="L72" class="LineNr"> 72 </span> <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L74" class="LineNr"> 74 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"2b"</span><span class="Delimiter">,</span> <span class="Constant">"subtract rm32 from r32 (sub)"</span><span class="Delimiter">);</span> +<span id="L74" class="LineNr"> 74 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"2b"</span><span class="Delimiter">,</span> <span class="Constant">"subtract rm32 from r32 (sub)"</span><span class="Delimiter">);</span> <span id="L75" class="LineNr"> 75 </span> <span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(scenario subtract_mem_at_r32_from_r32)</span> <span id="L77" class="LineNr"> 77 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -146,17 +146,17 @@ if ('onhashchange' in window) { <span id="L82" class="LineNr"> 82 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L83" class="LineNr"> 83 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L84" class="LineNr"> 84 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: subtract r/m32 from EBX</span> +<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: subtract r/m32 from <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L87" class="LineNr"> 87 </span><span class="traceContains">+run: storing 0x00000009</span> <span id="L88" class="LineNr"> 88 </span> <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> <span class="Constant">0x2b</span>: <span class="Delimiter">{</span> <span class="Comment">// subtract r/m32 from r32</span> -<span id="L91" class="LineNr"> 91 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L91" class="LineNr"> 91 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L92" class="LineNr"> 92 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L93" class="LineNr"> 93 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract r/m32 from "</span> << rname<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L94" class="LineNr"> 94 </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="L95" class="LineNr"> 95 </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="L93" class="LineNr"> 93 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract r/m32 from "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L94" class="LineNr"> 94 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L95" class="LineNr"> 95 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> <span id="L96" class="LineNr"> 96 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span> <span id="L98" class="LineNr"> 98 </span> @@ -171,14 +171,14 @@ if ('onhashchange' in window) { <span id="L107" class="LineNr">107 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L108" class="LineNr">108 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L109" class="LineNr">109 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L110" class="LineNr">110 </span><span class="traceContains">+run: and EBX with r/m32</span> +<span id="L110" class="LineNr">110 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> <span id="L111" class="LineNr">111 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L112" class="LineNr">112 </span><span class="traceContains">+run: storing 0x0000000d</span> <span id="L113" class="LineNr">113 </span> <span id="L114" class="LineNr">114 </span><span class="Comment">//:</span> <span id="L115" class="LineNr">115 </span> <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L117" class="LineNr">117 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"23"</span><span class="Delimiter">,</span> <span class="Constant">"r32 = bitwise AND of r32 with rm32 (and)"</span><span class="Delimiter">);</span> +<span id="L117" class="LineNr">117 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"23"</span><span class="Delimiter">,</span> <span class="Constant">"r32 = bitwise AND of r32 with rm32 (and)"</span><span class="Delimiter">);</span> <span id="L118" class="LineNr">118 </span> <span id="L119" class="LineNr">119 </span><span class="Delimiter">:(scenario and_mem_at_r32_with_r32)</span> <span id="L120" class="LineNr">120 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -189,17 +189,17 @@ if ('onhashchange' in window) { <span id="L125" class="LineNr">125 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L126" class="LineNr">126 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L127" class="LineNr">127 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 0xff</span> -<span id="L128" class="LineNr">128 </span><span class="traceContains">+run: and r/m32 with EBX</span> +<span id="L128" class="LineNr">128 </span><span class="traceContains">+run: and r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L129" class="LineNr">129 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L130" class="LineNr">130 </span><span class="traceContains">+run: storing 0x0000000d</span> <span id="L131" class="LineNr">131 </span> <span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">0x23</span>: <span class="Delimiter">{</span> <span class="Comment">// and r/m32 with r32</span> -<span id="L134" class="LineNr">134 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L134" class="LineNr">134 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L135" class="LineNr">135 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L136" class="LineNr">136 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"and r/m32 with "</span> << rname<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L137" class="LineNr">137 </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="L138" class="LineNr">138 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>&<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> +<span id="L136" class="LineNr">136 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"and r/m32 with "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L137" class="LineNr">137 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L138" class="LineNr">138 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> <span id="L139" class="LineNr">139 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span> <span id="L141" class="LineNr">141 </span> @@ -214,14 +214,14 @@ if ('onhashchange' in window) { <span id="L150" class="LineNr">150 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L151" class="LineNr">151 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L152" class="LineNr">152 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L153" class="LineNr">153 </span><span class="traceContains">+run: or EBX with r/m32</span> +<span id="L153" class="LineNr">153 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> <span id="L154" class="LineNr">154 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L155" class="LineNr">155 </span><span class="traceContains">+run: storing 0xaabbccdd</span> <span id="L156" class="LineNr">156 </span> <span id="L157" class="LineNr">157 </span><span class="Comment">//:</span> <span id="L158" class="LineNr">158 </span> <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L160" class="LineNr">160 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"0b"</span><span class="Delimiter">,</span> <span class="Constant">"r32 = bitwise OR of r32 with rm32 (or)"</span><span class="Delimiter">);</span> +<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"0b"</span><span class="Delimiter">,</span> <span class="Constant">"r32 = bitwise OR of r32 with rm32 (or)"</span><span class="Delimiter">);</span> <span id="L161" class="LineNr">161 </span> <span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario or_mem_at_r32_with_r32)</span> <span id="L163" class="LineNr">163 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -232,17 +232,17 @@ if ('onhashchange' in window) { <span id="L168" class="LineNr">168 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L169" class="LineNr">169 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L170" class="LineNr">170 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: or r/m32 with EBX</span> +<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: or r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L172" class="LineNr">172 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L173" class="LineNr">173 </span><span class="traceContains">+run: storing 0xaabbccdd</span> <span id="L174" class="LineNr">174 </span> <span id="L175" class="LineNr">175 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L176" class="LineNr">176 </span><span class="Normal">case</span> <span class="Constant">0x0b</span>: <span class="Delimiter">{</span> <span class="Comment">// or r/m32 with r32</span> -<span id="L177" class="LineNr">177 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L177" class="LineNr">177 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L178" class="LineNr">178 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L179" class="LineNr">179 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"or r/m32 with "</span> << rname<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L180" class="LineNr">180 </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="L181" class="LineNr">181 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> +<span id="L179" class="LineNr">179 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"or r/m32 with "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L180" class="LineNr">180 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L181" class="LineNr">181 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> <span id="L182" class="LineNr">182 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span> <span id="L184" class="LineNr">184 </span> @@ -257,14 +257,14 @@ if ('onhashchange' in window) { <span id="L193" class="LineNr">193 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L194" class="LineNr">194 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L195" class="LineNr">195 </span>0d 0c bb aa <span class="Comment"># 0xaabb0c0d</span> -<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: xor EBX with r/m32</span> +<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> <span id="L197" class="LineNr">197 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L198" class="LineNr">198 </span><span class="traceContains">+run: storing 0x0a0bccdd</span> <span id="L199" class="LineNr">199 </span> <span id="L200" class="LineNr">200 </span><span class="Comment">//:</span> <span id="L201" class="LineNr">201 </span> <span id="L202" class="LineNr">202 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L203" class="LineNr">203 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"33"</span><span class="Delimiter">,</span> <span class="Constant">"r32 = bitwise XOR of r32 with rm32 (xor)"</span><span class="Delimiter">);</span> +<span id="L203" class="LineNr">203 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"33"</span><span class="Delimiter">,</span> <span class="Constant">"r32 = bitwise XOR of r32 with rm32 (xor)"</span><span class="Delimiter">);</span> <span id="L204" class="LineNr">204 </span> <span id="L205" class="LineNr">205 </span><span class="Delimiter">:(scenario xor_mem_at_r32_with_r32)</span> <span id="L206" class="LineNr">206 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -275,17 +275,17 @@ if ('onhashchange' in window) { <span id="L211" class="LineNr">211 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L212" class="LineNr">212 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L213" class="LineNr">213 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: xor r/m32 with EBX</span> +<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: xor r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L215" class="LineNr">215 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L216" class="LineNr">216 </span><span class="traceContains">+run: storing 0xaabbccdd</span> <span id="L217" class="LineNr">217 </span> <span id="L218" class="LineNr">218 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L219" class="LineNr">219 </span><span class="Normal">case</span> <span class="Constant">0x33</span>: <span class="Delimiter">{</span> <span class="Comment">// xor r/m32 with r32</span> -<span id="L220" class="LineNr">220 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L220" class="LineNr">220 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L221" class="LineNr">221 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L222" class="LineNr">222 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"xor r/m32 with "</span> << rname<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L223" class="LineNr">223 </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="L224" class="LineNr">224 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> +<span id="L222" class="LineNr">222 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"xor r/m32 with "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L223" class="LineNr">223 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L224" class="LineNr">224 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[arg1]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> *arg2<span class="Delimiter">);</span> <span id="L225" class="LineNr">225 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L226" class="LineNr">226 </span><span class="Delimiter">}</span> <span id="L227" class="LineNr">227 </span> @@ -315,7 +315,7 @@ if ('onhashchange' in window) { <span id="L251" class="LineNr">251 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L252" class="LineNr">252 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L253" class="LineNr">253 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L254" class="LineNr">254 </span><span class="traceContains">+run: compare EBX with r/m32</span> +<span id="L254" class="LineNr">254 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> <span id="L255" class="LineNr">255 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L256" class="LineNr">256 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span> <span id="L257" class="LineNr">257 </span> @@ -328,7 +328,7 @@ if ('onhashchange' in window) { <span id="L264" class="LineNr">264 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L265" class="LineNr">265 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L266" class="LineNr">266 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: compare EBX with r/m32</span> +<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> <span id="L268" class="LineNr">268 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L269" class="LineNr">269 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span> <span id="L270" class="LineNr">270 </span> @@ -341,14 +341,14 @@ if ('onhashchange' in window) { <span id="L277" class="LineNr">277 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L278" class="LineNr">278 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L279" class="LineNr">279 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: compare EBX with r/m32</span> +<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span> <span id="L281" class="LineNr">281 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L282" class="LineNr">282 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span> <span id="L283" class="LineNr">283 </span> <span id="L284" class="LineNr">284 </span><span class="Comment">//:</span> <span id="L285" class="LineNr">285 </span> <span id="L286" class="LineNr">286 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L287" class="LineNr">287 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"3b"</span><span class="Delimiter">,</span> <span class="Constant">"compare: set SF if r32 < rm32 (cmp)"</span><span class="Delimiter">);</span> +<span id="L287" class="LineNr">287 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"3b"</span><span class="Delimiter">,</span> <span class="Constant">"compare: set SF if r32 < rm32 (cmp)"</span><span class="Delimiter">);</span> <span id="L288" class="LineNr">288 </span> <span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span> <span id="L290" class="LineNr">290 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -359,23 +359,23 @@ if ('onhashchange' in window) { <span id="L295" class="LineNr">295 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L296" class="LineNr">296 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L297" class="LineNr">297 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: compare r/m32 with EBX</span> +<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L299" class="LineNr">299 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L300" class="LineNr">300 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span> <span id="L301" class="LineNr">301 </span> <span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L303" class="LineNr">303 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span> <span class="Comment">// set SF if r32 < r/m32</span> -<span id="L304" class="LineNr">304 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L304" class="LineNr">304 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L305" class="LineNr">305 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> reg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L306" class="LineNr">306 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"compare r/m32 with "</span> << rname<span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L306" class="LineNr">306 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"compare r/m32 with "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L307" class="LineNr">307 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> -<span id="L308" class="LineNr">308 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L308" class="LineNr">308 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L309" class="LineNr">309 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span> <span id="L310" class="LineNr">310 </span> SF = <span class="Delimiter">(</span>tmp1 < <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L311" class="LineNr">311 </span> ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L312" class="LineNr">312 </span> <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span> -<span id="L313" class="LineNr">313 </span> OF = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> -<span id="L314" class="LineNr">314 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << OF << end<span class="Delimiter">();</span> +<span id="L313" class="LineNr">313 </span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> +<span id="L314" class="LineNr">314 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << <a href='010---vm.cc.html#L81'>OF</a> << end<span class="Delimiter">();</span> <span id="L315" class="LineNr">315 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span> <span id="L317" class="LineNr">317 </span> @@ -388,7 +388,7 @@ if ('onhashchange' in window) { <span id="L324" class="LineNr">324 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L325" class="LineNr">325 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L326" class="LineNr">326 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: compare r/m32 with EBX</span> +<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L328" class="LineNr">328 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L329" class="LineNr">329 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span> <span id="L330" class="LineNr">330 </span> @@ -401,7 +401,7 @@ if ('onhashchange' in window) { <span id="L337" class="LineNr">337 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> <span id="L338" class="LineNr">338 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L339" class="LineNr">339 </span>0d 0c 0b 0a <span class="Comment"># 0x0a0b0c0d</span> -<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: compare r/m32 with EBX</span> +<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L341" class="LineNr">341 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L342" class="LineNr">342 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span> <span id="L343" class="LineNr">343 </span> @@ -414,14 +414,14 @@ if ('onhashchange' in window) { <span id="L350" class="LineNr">350 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L351" class="LineNr">351 </span> <span class="Constant">89</span> <span class="Constant">18</span> <span class="Comment"># copy EBX to *EAX</span> <span id="L352" class="LineNr">352 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span> -<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: copy EBX to r/m32</span> +<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L354" class="LineNr">354 </span><span class="traceContains">+run: effective address is 0x00000060 (EAX)</span> <span id="L355" class="LineNr">355 </span><span class="traceContains">+run: storing 0x000000af</span> <span id="L356" class="LineNr">356 </span> <span id="L357" class="LineNr">357 </span><span class="Comment">//:</span> <span id="L358" class="LineNr">358 </span> <span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L360" class="LineNr">360 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"8b"</span><span class="Delimiter">,</span> <span class="Constant">"copy rm32 to r32 (mov)"</span><span class="Delimiter">);</span> +<span id="L360" class="LineNr">360 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"8b"</span><span class="Delimiter">,</span> <span class="Constant">"copy rm32 to r32 (mov)"</span><span class="Delimiter">);</span> <span id="L361" class="LineNr">361 </span> <span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span> <span id="L363" class="LineNr">363 </span><span class="Special">% Reg[EAX].i = 0x2000;</span> @@ -431,18 +431,18 @@ if ('onhashchange' in window) { <span id="L367" class="LineNr">367 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span> <span id="L368" class="LineNr">368 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L369" class="LineNr">369 </span>af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 0xaf</span> -<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: copy r/m32 to EBX</span> +<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: copy r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L371" class="LineNr">371 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L372" class="LineNr">372 </span><span class="traceContains">+run: storing 0x000000af</span> <span id="L373" class="LineNr">373 </span> <span id="L374" class="LineNr">374 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L375" class="LineNr">375 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span> <span class="Comment">// copy r32 to r/m32</span> -<span id="L376" class="LineNr">376 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L376" class="LineNr">376 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L377" class="LineNr">377 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L378" class="LineNr">378 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy r/m32 to "</span> << rname<span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L379" class="LineNr">379 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* src = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L378" class="LineNr">378 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy r/m32 to "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L379" class="LineNr">379 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* src = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L380" class="LineNr">380 </span> Reg[rdest]<span class="Delimiter">.</span>i = *src<span class="Delimiter">;</span> -<span id="L381" class="LineNr">381 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXWORD << *src << end<span class="Delimiter">();</span> +<span id="L381" class="LineNr">381 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << *src << end<span class="Delimiter">();</span> <span id="L382" class="LineNr">382 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L383" class="LineNr">383 </span><span class="Delimiter">}</span> <span id="L384" class="LineNr">384 </span> @@ -467,10 +467,10 @@ if ('onhashchange' in window) { <span id="L403" class="LineNr">403 </span> <span id="L404" class="LineNr">404 </span><span class="Delimiter">:(before "End Op ff Subops")</span> <span id="L405" class="LineNr">405 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span> <span class="Comment">// jump to r/m32</span> -<span id="L406" class="LineNr">406 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump to r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L407" class="LineNr">407 </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="L408" class="LineNr">408 </span> EIP = *arg2<span class="Delimiter">;</span> -<span id="L409" class="LineNr">409 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << HEXWORD << EIP << end<span class="Delimiter">();</span> +<span id="L406" class="LineNr">406 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump to r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L407" class="LineNr">407 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L408" class="LineNr">408 </span> <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span> +<span id="L409" class="LineNr">409 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << end<span class="Delimiter">();</span> <span id="L410" class="LineNr">410 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span> <span id="L412" class="LineNr">412 </span> @@ -485,23 +485,23 @@ if ('onhashchange' in window) { <span id="L421" class="LineNr">421 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span> <span id="L422" class="LineNr">422 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L423" class="LineNr">423 </span>af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 0xaf</span> -<span id="L424" class="LineNr">424 </span><span class="traceContains">+run: push r/m32</span> +<span id="L424" class="LineNr">424 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> r/m32</span> <span id="L425" class="LineNr">425 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> -<span id="L426" class="LineNr">426 </span><span class="traceContains">+run: decrementing ESP to 0x00000010</span> +<span id="L426" class="LineNr">426 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span> <span id="L427" class="LineNr">427 </span><span class="traceContains">+run: pushing value 0x000000af</span> <span id="L428" class="LineNr">428 </span> <span id="L429" class="LineNr">429 </span><span class="Delimiter">:(before "End Op ff Subops")</span> <span id="L430" class="LineNr">430 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span> <span class="Comment">// push r/m32 to stack</span> -<span id="L431" class="LineNr">431 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"push r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L432" class="LineNr">432 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L433" class="LineNr">433 </span> push<span class="Delimiter">(</span>*val<span class="Delimiter">);</span> +<span id="L431" class="LineNr">431 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"push r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L432" class="LineNr">432 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L433" class="LineNr">433 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span> <span id="L434" class="LineNr">434 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L435" class="LineNr">435 </span><span class="Delimiter">}</span> <span id="L436" class="LineNr">436 </span> <span id="L437" class="LineNr">437 </span><span class="SalientComment">//:: pop</span> <span id="L438" class="LineNr">438 </span> <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L440" class="LineNr">440 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to rm32 (pop)"</span><span class="Delimiter">);</span> +<span id="L440" class="LineNr">440 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">"pop top of stack to rm32 (pop)"</span><span class="Delimiter">);</span> <span id="L441" class="LineNr">441 </span> <span id="L442" class="LineNr">442 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span> <span id="L443" class="LineNr">443 </span><span class="Special">% Reg[EAX].i = 0x60;</span> @@ -512,20 +512,20 @@ if ('onhashchange' in window) { <span id="L448" class="LineNr">448 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span> <span id="L449" class="LineNr">449 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L450" class="LineNr">450 </span><span class="Constant">30</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 0x30</span> -<span id="L451" class="LineNr">451 </span><span class="traceContains">+run: pop into r/m32</span> +<span id="L451" class="LineNr">451 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L630'>pop</a> into r/m32</span> <span id="L452" class="LineNr">452 </span><span class="traceContains">+run: effective address is 0x00000060 (EAX)</span> <span id="L453" class="LineNr">453 </span><span class="traceContains">+run: popping value 0x00000030</span> -<span id="L454" class="LineNr">454 </span><span class="traceContains">+run: incrementing ESP to 0x00002004</span> +<span id="L454" class="LineNr">454 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00002004</span> <span id="L455" class="LineNr">455 </span> <span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L457" class="LineNr">457 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span> <span class="Comment">// pop stack into r/m32</span> -<span id="L458" class="LineNr">458 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L458" class="LineNr">458 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L459" class="LineNr">459 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> <span id="L460" class="LineNr">460 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L461" class="LineNr">461 </span> <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span> -<span id="L462" class="LineNr">462 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"pop into r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L463" class="LineNr">463 </span> <span class="Normal">int32_t</span>* dest = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L464" class="LineNr">464 </span> *dest = pop<span class="Delimiter">();</span> +<span id="L462" class="LineNr">462 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"pop into r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L463" class="LineNr">463 </span> <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L464" class="LineNr">464 </span> *dest = <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">();</span> <span id="L465" class="LineNr">465 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L466" class="LineNr">466 </span> <span class="Delimiter">}</span> <span id="L467" class="LineNr">467 </span> <span class="Delimiter">}</span> @@ -542,14 +542,14 @@ if ('onhashchange' in window) { <span id="L478" class="LineNr">478 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span> <span id="L479" class="LineNr">479 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L480" class="LineNr">480 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L481" class="LineNr">481 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L481" class="LineNr">481 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L482" class="LineNr">482 </span><span class="traceContains">+run: effective address is 0x00002000 (disp32)</span> <span id="L483" class="LineNr">483 </span><span class="traceContains">+run: storing 0x00000011</span> <span id="L484" class="LineNr">484 </span> <span id="L485" class="LineNr">485 </span><span class="Delimiter">:(before "End Mod 0 Special-cases(addr)")</span> <span id="L486" class="LineNr">486 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Comment">// exception: mod 0b00 rm 0b101 => incoming disp32</span> -<span id="L487" class="LineNr">487 </span> addr = next32<span class="Delimiter">();</span> -<span id="L488" class="LineNr">488 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << HEXWORD << addr << <span class="Constant">" (disp32)"</span> << end<span class="Delimiter">();</span> +<span id="L487" class="LineNr">487 </span> addr = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L488" class="LineNr">488 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" (disp32)"</span> << end<span class="Delimiter">();</span> <span id="L489" class="LineNr">489 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L490" class="LineNr">490 </span> <span id="L491" class="LineNr">491 </span><span class="Comment">//:</span> @@ -563,7 +563,7 @@ if ('onhashchange' in window) { <span id="L499" class="LineNr">499 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span> <span id="L500" class="LineNr">500 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L501" class="LineNr">501 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L502" class="LineNr">502 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L502" class="LineNr">502 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L503" class="LineNr">503 </span><span class="traceContains">+run: effective address is initially 0x00001ffe (EAX)</span> <span id="L504" class="LineNr">504 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp8)</span> <span id="L505" class="LineNr">505 </span><span class="traceContains">+run: storing 0x00000011</span> @@ -573,13 +573,13 @@ if ('onhashchange' in window) { <span id="L509" class="LineNr">509 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L510" class="LineNr">510 </span> <span class="Normal">default</span>: <span id="L511" class="LineNr">511 </span> addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> -<span id="L512" class="LineNr">512 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << HEXWORD << addr << <span class="Constant">" ("</span> << rname<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> +<span id="L512" class="LineNr">512 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" ("</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> <span id="L513" class="LineNr">513 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L514" class="LineNr">514 </span> <span class="Comment">// End Mod 1 Special-cases(addr)</span> <span id="L515" class="LineNr">515 </span> <span class="Delimiter">}</span> <span id="L516" class="LineNr">516 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>addr > <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L517" class="LineNr">517 </span> addr += <span class="Normal">static_cast</span><<span class="Normal">int8_t</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> -<span id="L518" class="LineNr">518 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << HEXWORD << addr << <span class="Constant">" (after adding disp8)"</span> << end<span class="Delimiter">();</span> +<span id="L517" class="LineNr">517 </span> addr += <span class="Normal">static_cast</span><<span class="Normal">int8_t</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> +<span id="L518" class="LineNr">518 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" (after adding disp8)"</span> << end<span class="Delimiter">();</span> <span id="L519" class="LineNr">519 </span> <span class="Delimiter">}</span> <span id="L520" class="LineNr">520 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L521" class="LineNr">521 </span> @@ -592,7 +592,7 @@ if ('onhashchange' in window) { <span id="L528" class="LineNr">528 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span> <span id="L529" class="LineNr">529 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L530" class="LineNr">530 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L531" class="LineNr">531 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L531" class="LineNr">531 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L532" class="LineNr">532 </span><span class="traceContains">+run: effective address is initially 0x00002001 (EAX)</span> <span id="L533" class="LineNr">533 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp8)</span> <span id="L534" class="LineNr">534 </span><span class="traceContains">+run: storing 0x00000011</span> @@ -608,7 +608,7 @@ if ('onhashchange' in window) { <span id="L544" class="LineNr">544 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span> <span id="L545" class="LineNr">545 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L546" class="LineNr">546 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L548" class="LineNr">548 </span><span class="traceContains">+run: effective address is initially 0x00001ffe (EAX)</span> <span id="L549" class="LineNr">549 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp32)</span> <span id="L550" class="LineNr">550 </span><span class="traceContains">+run: storing 0x00000011</span> @@ -618,13 +618,13 @@ if ('onhashchange' in window) { <span id="L554" class="LineNr">554 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L555" class="LineNr">555 </span> <span class="Normal">default</span>: <span id="L556" class="LineNr">556 </span> addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> -<span id="L557" class="LineNr">557 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << HEXWORD << addr << <span class="Constant">" ("</span> << rname<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> +<span id="L557" class="LineNr">557 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" ("</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> <span id="L558" class="LineNr">558 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L559" class="LineNr">559 </span> <span class="Comment">// End Mod 2 Special-cases(addr)</span> <span id="L560" class="LineNr">560 </span> <span class="Delimiter">}</span> <span id="L561" class="LineNr">561 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>addr > <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L562" class="LineNr">562 </span> addr += next32<span class="Delimiter">();</span> -<span id="L563" class="LineNr">563 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << HEXWORD << addr << <span class="Constant">" (after adding disp32)"</span> << end<span class="Delimiter">();</span> +<span id="L562" class="LineNr">562 </span> addr += <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L563" class="LineNr">563 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" (after adding disp32)"</span> << end<span class="Delimiter">();</span> <span id="L564" class="LineNr">564 </span> <span class="Delimiter">}</span> <span id="L565" class="LineNr">565 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L566" class="LineNr">566 </span> @@ -637,7 +637,7 @@ if ('onhashchange' in window) { <span id="L573" class="LineNr">573 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span> <span id="L574" class="LineNr">574 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L575" class="LineNr">575 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L576" class="LineNr">576 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L576" class="LineNr">576 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L577" class="LineNr">577 </span><span class="traceContains">+run: effective address is initially 0x00002001 (EAX)</span> <span id="L578" class="LineNr">578 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp32)</span> <span id="L579" class="LineNr">579 </span><span class="traceContains">+run: storing 0x00000011</span> @@ -645,7 +645,7 @@ if ('onhashchange' in window) { <span id="L581" class="LineNr">581 </span><span class="SalientComment">//:: copy address (lea)</span> <span id="L582" class="LineNr">582 </span> <span id="L583" class="LineNr">583 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L584" class="LineNr">584 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">"copy address in rm32 into r32 (lea)"</span><span class="Delimiter">);</span> +<span id="L584" class="LineNr">584 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">"copy address in rm32 into r32 (lea)"</span><span class="Delimiter">);</span> <span id="L585" class="LineNr">585 </span> <span id="L586" class="LineNr">586 </span><span class="Delimiter">:(scenario copy_address)</span> <span id="L587" class="LineNr">587 </span><span class="Special">% Reg[EAX].u = 0x2000;</span> @@ -653,15 +653,15 @@ if ('onhashchange' in window) { <span id="L589" class="LineNr">589 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L590" class="LineNr">590 </span> 8d <span class="Constant">18</span> <span id="L591" class="LineNr">591 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span> -<span id="L592" class="LineNr">592 </span><span class="traceContains">+run: copy address into EBX</span> +<span id="L592" class="LineNr">592 </span><span class="traceContains">+run: copy address into <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L593" class="LineNr">593 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L594" class="LineNr">594 </span> <span id="L595" class="LineNr">595 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L596" class="LineNr">596 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span> <span class="Comment">// copy address of m32 to r32</span> -<span id="L597" class="LineNr">597 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L597" class="LineNr">597 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L598" class="LineNr">598 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> arg1 = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L599" class="LineNr">599 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy address into "</span> << rname<span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L600" class="LineNr">600 </span> Reg[arg1]<span class="Delimiter">.</span>u = effective_address_number<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L599" class="LineNr">599 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy address into "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>arg1<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L600" class="LineNr">600 </span> Reg[arg1]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> <span id="L601" class="LineNr">601 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L602" class="LineNr">602 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html index 68bcd44b..9d1d1870 100644 --- a/html/subx/015immediate_addressing.cc.html +++ b/html/subx/015immediate_addressing.cc.html @@ -65,7 +65,7 @@ if ('onhashchange' in window) { <span id="L1" class="LineNr"> 1 </span><span class="Comment">//: instructions that (immediately) contain an argument to act with</span> <span id="L2" class="LineNr"> 2 </span> <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L4" class="LineNr"> 4 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"81"</span><span class="Delimiter">,</span> <span class="Constant">"combine rm32 with imm32 based on subop (add/sub/and/or/xor/cmp)"</span><span class="Delimiter">);</span> +<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"81"</span><span class="Delimiter">,</span> <span class="Constant">"combine rm32 with imm32 based on subop (add/sub/and/or/xor/cmp)"</span><span class="Delimiter">);</span> <span id="L5" class="LineNr"> 5 </span> <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario add_imm32_to_r32)</span> <span id="L7" class="LineNr"> 7 </span><span class="Special">% Reg[EBX].i = 1;</span> @@ -74,27 +74,27 @@ if ('onhashchange' in window) { <span id="L10" class="LineNr"> 10 </span> <span class="Constant">81</span> c3 0a 0b 0c 0d <span class="Comment"># add 0x0d0c0b0a to EBX</span> <span id="L11" class="LineNr"> 11 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (add imm32) 011 (dest EBX)</span> <span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span> <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: subop add</span> <span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span> <span id="L17" class="LineNr"> 17 </span> <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L19" class="LineNr"> 19 </span><span class="Normal">case</span> <span class="Constant">0x81</span>: <span class="Delimiter">{</span> <span class="Comment">// combine imm32 with r/m32</span> -<span id="L20" class="LineNr"> 20 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"combine imm32 with r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L21" class="LineNr"> 21 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> -<span id="L22" class="LineNr"> 22 </span> <span class="Normal">int32_t</span>* arg1 = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L23" class="LineNr"> 23 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L24" class="LineNr"> 24 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"imm32 is 0x"</span> << HEXWORD << arg2 << end<span class="Delimiter">();</span> +<span id="L20" class="LineNr"> 20 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"combine imm32 with r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L21" class="LineNr"> 21 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> +<span id="L22" class="LineNr"> 22 </span> <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L23" class="LineNr"> 23 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L24" class="LineNr"> 24 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"imm32 is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << end<span class="Delimiter">();</span> <span id="L25" class="LineNr"> 25 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm>><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="L26" class="LineNr"> 26 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L27" class="LineNr"> 27 </span> <span class="Normal">case</span> <span class="Constant">0</span>: -<span id="L28" class="LineNr"> 28 </span> trace<span class="Delimiter">(</span><span class="Constant">90</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="L29" class="LineNr"> 29 </span> BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> +<span id="L28" class="LineNr"> 28 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop add"</span> << end<span class="Delimiter">();</span> +<span id="L29" class="LineNr"> 29 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L30" class="LineNr"> 30 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L31" class="LineNr"> 31 </span> <span class="Comment">// End Op 81 Subops</span> <span id="L32" class="LineNr"> 32 </span> <span class="Normal">default</span>: -<span id="L33" class="LineNr"> 33 </span> cerr << <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="L33" class="LineNr"> 33 </span> cerr << <span class="Constant">"unrecognized sub-opcode after 81: "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L34" class="LineNr"> 34 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L35" class="LineNr"> 35 </span> <span class="Delimiter">}</span> <span id="L36" class="LineNr"> 36 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> @@ -119,21 +119,21 @@ if ('onhashchange' in window) { <span id="L55" class="LineNr"> 55 </span><span class="SalientComment">//:: subtract</span> <span id="L56" class="LineNr"> 56 </span> <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L58" class="LineNr"> 58 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"2d"</span><span class="Delimiter">,</span> <span class="Constant">"subtract imm32 from EAX (sub)"</span><span class="Delimiter">);</span> +<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"2d"</span><span class="Delimiter">,</span> <span class="Constant">"subtract imm32 from <a href='010---vm.cc.html#L13'>EAX</a> (sub)"</span><span class="Delimiter">);</span> <span id="L59" class="LineNr"> 59 </span> <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span> <span id="L61" class="LineNr"> 61 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span> <span id="L62" class="LineNr"> 62 </span>== <span class="Constant">0x1</span> <span id="L63" class="LineNr"> 63 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L64" class="LineNr"> 64 </span> 2d 0a 0b 0c 0d <span class="Comment"># subtract 0x0d0c0b0a from EAX</span> -<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+run: subtract imm32 0x0d0c0b0a from EAX</span> +<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+run: subtract imm32 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L66" class="LineNr"> 66 </span><span class="traceContains">+run: storing 0x000000a0</span> <span id="L67" class="LineNr"> 67 </span> <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L69" class="LineNr"> 69 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span> <span class="Comment">// subtract imm32 from EAX</span> -<span id="L70" class="LineNr"> 70 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L71" class="LineNr"> 71 </span> trace<span class="Delimiter">(</span><span class="Constant">90</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 EAX"</span> << end<span class="Delimiter">();</span> -<span id="L72" class="LineNr"> 72 </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="L70" class="LineNr"> 70 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L71" class="LineNr"> 71 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subtract imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << <span class="Constant">" from EAX"</span> << end<span class="Delimiter">();</span> +<span id="L72" class="LineNr"> 72 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L73" class="LineNr"> 73 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span> <span id="L75" class="LineNr"> 75 </span> @@ -155,8 +155,8 @@ if ('onhashchange' in window) { <span id="L91" class="LineNr"> 91 </span> <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before "End Op 81 Subops")</span> <span id="L93" class="LineNr"> 93 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span> -<span id="L94" class="LineNr"> 94 </span> trace<span class="Delimiter">(</span><span class="Constant">90</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="L95" class="LineNr"> 95 </span> BINARY_ARITHMETIC_OP<span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> +<span id="L94" class="LineNr"> 94 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop subtract"</span> << end<span class="Delimiter">();</span> +<span id="L95" class="LineNr"> 95 </span> <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L96" class="LineNr"> 96 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span> <span id="L98" class="LineNr"> 98 </span> @@ -169,7 +169,7 @@ if ('onhashchange' in window) { <span id="L105" class="LineNr">105 </span> <span class="Constant">81</span> eb <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># subtract 1 from EBX</span> <span id="L106" class="LineNr">106 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span> <span id="L107" class="LineNr">107 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L108" class="LineNr">108 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L109" class="LineNr">109 </span><span class="traceContains">+run: imm32 is 0x00000001</span> <span id="L110" class="LineNr">110 </span><span class="traceContains">+run: subop subtract</span> <span id="L111" class="LineNr">111 </span><span class="traceContains">+run: storing 0x00000009</span> @@ -177,21 +177,21 @@ if ('onhashchange' in window) { <span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: and</span> <span id="L114" class="LineNr">114 </span> <span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L116" class="LineNr">116 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"25"</span><span class="Delimiter">,</span> <span class="Constant">"EAX = bitwise AND of imm32 with EAX (and)"</span><span class="Delimiter">);</span> +<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"25"</span><span class="Delimiter">,</span> <span class="Constant">"EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)"</span><span class="Delimiter">);</span> <span id="L117" class="LineNr">117 </span> <span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span> <span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EAX].i = 0xff;</span> <span id="L120" class="LineNr">120 </span>== <span class="Constant">0x1</span> <span id="L121" class="LineNr">121 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L122" class="LineNr">122 </span> <span class="Constant">25</span> 0a 0b 0c 0d <span class="Comment"># and 0x0d0c0b0a with EAX</span> -<span id="L123" class="LineNr">123 </span><span class="traceContains">+run: and imm32 0x0d0c0b0a with EAX</span> +<span id="L123" class="LineNr">123 </span><span class="traceContains">+run: and imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L124" class="LineNr">124 </span><span class="traceContains">+run: storing 0x0000000a</span> <span id="L125" class="LineNr">125 </span> <span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L127" class="LineNr">127 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span> <span class="Comment">// and imm32 with EAX</span> -<span id="L128" class="LineNr">128 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L129" class="LineNr">129 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"and imm32 0x"</span> << HEXWORD << arg2 << <span class="Constant">" with EAX"</span> << end<span class="Delimiter">();</span> -<span id="L130" class="LineNr">130 </span> BINARY_BITWISE_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="L128" class="LineNr">128 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L129" class="LineNr">129 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"and imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << <span class="Constant">" with EAX"</span> << end<span class="Delimiter">();</span> +<span id="L130" class="LineNr">130 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L131" class="LineNr">131 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span> <span id="L133" class="LineNr">133 </span> @@ -213,8 +213,8 @@ if ('onhashchange' in window) { <span id="L149" class="LineNr">149 </span> <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before "End Op 81 Subops")</span> <span id="L151" class="LineNr">151 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span> -<span id="L152" class="LineNr">152 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop and"</span> << end<span class="Delimiter">();</span> -<span id="L153" class="LineNr">153 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>&<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> +<span id="L152" class="LineNr">152 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop and"</span> << end<span class="Delimiter">();</span> +<span id="L153" class="LineNr">153 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L154" class="LineNr">154 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L155" class="LineNr">155 </span><span class="Delimiter">}</span> <span id="L156" class="LineNr">156 </span> @@ -227,7 +227,7 @@ if ('onhashchange' in window) { <span id="L163" class="LineNr">163 </span> <span class="Constant">81</span> e3 0a 0b 0c 0d <span class="Comment"># and 0x0d0c0b0a with EBX</span> <span id="L164" class="LineNr">164 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span> <span id="L165" class="LineNr">165 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L166" class="LineNr">166 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L166" class="LineNr">166 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L167" class="LineNr">167 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span> <span id="L168" class="LineNr">168 </span><span class="traceContains">+run: subop and</span> <span id="L169" class="LineNr">169 </span><span class="traceContains">+run: storing 0x0000000a</span> @@ -235,21 +235,21 @@ if ('onhashchange' in window) { <span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: or</span> <span id="L172" class="LineNr">172 </span> <span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L174" class="LineNr">174 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"0d"</span><span class="Delimiter">,</span> <span class="Constant">"EAX = bitwise OR of imm32 with EAX (or)"</span><span class="Delimiter">);</span> +<span id="L174" class="LineNr">174 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"0d"</span><span class="Delimiter">,</span> <span class="Constant">"EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)"</span><span class="Delimiter">);</span> <span id="L175" class="LineNr">175 </span> <span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span> <span id="L177" class="LineNr">177 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span> <span id="L178" class="LineNr">178 </span>== <span class="Constant">0x1</span> <span id="L179" class="LineNr">179 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L180" class="LineNr">180 </span> 0d 0a 0b 0c 0d <span class="Comment"># or 0x0d0c0b0a with EAX</span> -<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: or imm32 0x0d0c0b0a with EAX</span> +<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: or imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L182" class="LineNr">182 </span><span class="traceContains">+run: storing 0xddccbbaa</span> <span id="L183" class="LineNr">183 </span> <span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L185" class="LineNr">185 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span> <span class="Comment">// or imm32 with EAX</span> -<span id="L186" class="LineNr">186 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L187" class="LineNr">187 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"or imm32 0x"</span> << HEXWORD << arg2 << <span class="Constant">" with EAX"</span> << end<span class="Delimiter">();</span> -<span id="L188" class="LineNr">188 </span> BINARY_BITWISE_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="L186" class="LineNr">186 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L187" class="LineNr">187 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"or imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << <span class="Constant">" with EAX"</span> << end<span class="Delimiter">();</span> +<span id="L188" class="LineNr">188 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L189" class="LineNr">189 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span> <span id="L191" class="LineNr">191 </span> @@ -271,8 +271,8 @@ if ('onhashchange' in window) { <span id="L207" class="LineNr">207 </span> <span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before "End Op 81 Subops")</span> <span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span> -<span id="L210" class="LineNr">210 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop or"</span> << end<span class="Delimiter">();</span> -<span id="L211" class="LineNr">211 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> +<span id="L210" class="LineNr">210 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop or"</span> << end<span class="Delimiter">();</span> +<span id="L211" class="LineNr">211 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L212" class="LineNr">212 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span> <span id="L214" class="LineNr">214 </span> @@ -283,7 +283,7 @@ if ('onhashchange' in window) { <span id="L219" class="LineNr">219 </span> <span class="Constant">81</span> cb 0a 0b 0c 0d <span class="Comment"># or 0x0d0c0b0a with EBX</span> <span id="L220" class="LineNr">220 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span> <span id="L221" class="LineNr">221 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L222" class="LineNr">222 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L222" class="LineNr">222 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L223" class="LineNr">223 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span> <span id="L224" class="LineNr">224 </span><span class="traceContains">+run: subop or</span> <span id="L225" class="LineNr">225 </span><span class="traceContains">+run: storing 0xddccbbaa</span> @@ -291,21 +291,21 @@ if ('onhashchange' in window) { <span id="L227" class="LineNr">227 </span><span class="SalientComment">//:: xor</span> <span id="L228" class="LineNr">228 </span> <span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L230" class="LineNr">230 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"35"</span><span class="Delimiter">,</span> <span class="Constant">"EAX = bitwise XOR of imm32 with EAX (xor)"</span><span class="Delimiter">);</span> +<span id="L230" class="LineNr">230 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"35"</span><span class="Delimiter">,</span> <span class="Constant">"EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)"</span><span class="Delimiter">);</span> <span id="L231" class="LineNr">231 </span> <span id="L232" class="LineNr">232 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span> <span id="L233" class="LineNr">233 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span> <span id="L234" class="LineNr">234 </span>== <span class="Constant">0x1</span> <span id="L235" class="LineNr">235 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L236" class="LineNr">236 </span> <span class="Constant">35</span> 0a 0b 0c 0d <span class="Comment"># xor 0x0d0c0b0a with EAX</span> -<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: xor imm32 0x0d0c0b0a with EAX</span> +<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: xor imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L238" class="LineNr">238 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span> <span id="L239" class="LineNr">239 </span> <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L241" class="LineNr">241 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span> <span class="Comment">// xor imm32 with EAX</span> -<span id="L242" class="LineNr">242 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L243" class="LineNr">243 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"xor imm32 0x"</span> << HEXWORD << arg2 << <span class="Constant">" with EAX"</span> << end<span class="Delimiter">();</span> -<span id="L244" class="LineNr">244 </span> BINARY_BITWISE_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="L242" class="LineNr">242 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L243" class="LineNr">243 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"xor imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << <span class="Constant">" with EAX"</span> << end<span class="Delimiter">();</span> +<span id="L244" class="LineNr">244 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L245" class="LineNr">245 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span> <span id="L247" class="LineNr">247 </span> @@ -327,8 +327,8 @@ if ('onhashchange' in window) { <span id="L263" class="LineNr">263 </span> <span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before "End Op 81 Subops")</span> <span id="L265" class="LineNr">265 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span> -<span id="L266" class="LineNr">266 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop xor"</span> << end<span class="Delimiter">();</span> -<span id="L267" class="LineNr">267 </span> BINARY_BITWISE_OP<span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> +<span id="L266" class="LineNr">266 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop xor"</span> << end<span class="Delimiter">();</span> +<span id="L267" class="LineNr">267 </span> <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span> <span id="L268" class="LineNr">268 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span> <span id="L270" class="LineNr">270 </span> @@ -339,7 +339,7 @@ if ('onhashchange' in window) { <span id="L275" class="LineNr">275 </span> <span class="Constant">81</span> f3 0a 0b 0c 0d <span class="Comment"># xor 0x0d0c0b0a with EBX</span> <span id="L276" class="LineNr">276 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span> <span id="L277" class="LineNr">277 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L278" class="LineNr">278 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L278" class="LineNr">278 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L279" class="LineNr">279 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span> <span id="L280" class="LineNr">280 </span><span class="traceContains">+run: subop xor</span> <span id="L281" class="LineNr">281 </span><span class="traceContains">+run: storing 0xddccbbaa</span> @@ -347,27 +347,27 @@ if ('onhashchange' in window) { <span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: compare (cmp)</span> <span id="L284" class="LineNr">284 </span> <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L286" class="LineNr">286 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"3d"</span><span class="Delimiter">,</span> <span class="Constant">"compare: set SF if EAX < imm32 (cmp)"</span><span class="Delimiter">);</span> +<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"3d"</span><span class="Delimiter">,</span> <span class="Constant">"compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> < imm32 (cmp)"</span><span class="Delimiter">);</span> <span id="L287" class="LineNr">287 </span> <span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span> <span id="L289" class="LineNr">289 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span> <span id="L290" class="LineNr">290 </span>== <span class="Constant">0x1</span> <span id="L291" class="LineNr">291 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L292" class="LineNr">292 </span> 3d <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d <span class="Comment"># compare 0x0d0c0b07 with EAX</span> -<span id="L293" class="LineNr">293 </span><span class="traceContains">+run: compare EAX and imm32 0x0d0c0b07</span> +<span id="L293" class="LineNr">293 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b07</span> <span id="L294" class="LineNr">294 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span> <span id="L295" class="LineNr">295 </span> <span id="L296" class="LineNr">296 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L297" class="LineNr">297 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span> <span class="Comment">// compare EAX with imm32</span> <span id="L298" class="LineNr">298 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span> -<span id="L299" class="LineNr">299 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = next32<span class="Delimiter">();</span> -<span id="L300" class="LineNr">300 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"compare EAX and imm32 0x"</span> << HEXWORD << arg2 << end<span class="Delimiter">();</span> +<span id="L299" class="LineNr">299 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L300" class="LineNr">300 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << arg2 << end<span class="Delimiter">();</span> <span id="L301" class="LineNr">301 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span> <span id="L302" class="LineNr">302 </span> SF = <span class="Delimiter">(</span>tmp1 < <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L303" class="LineNr">303 </span> ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L304" class="LineNr">304 </span> <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span> -<span id="L305" class="LineNr">305 </span> OF = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> -<span id="L306" class="LineNr">306 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << OF << end<span class="Delimiter">();</span> +<span id="L305" class="LineNr">305 </span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> +<span id="L306" class="LineNr">306 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << <a href='010---vm.cc.html#L81'>OF</a> << end<span class="Delimiter">();</span> <span id="L307" class="LineNr">307 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span> <span id="L309" class="LineNr">309 </span> @@ -376,7 +376,7 @@ if ('onhashchange' in window) { <span id="L312" class="LineNr">312 </span>== <span class="Constant">0x1</span> <span id="L313" class="LineNr">313 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L314" class="LineNr">314 </span> 3d 0a 0b 0c 0d <span class="Comment"># compare 0x0d0c0b0a with EAX</span> -<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: compare EAX and imm32 0x0d0c0b0a</span> +<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span> <span id="L316" class="LineNr">316 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span> <span id="L317" class="LineNr">317 </span> <span id="L318" class="LineNr">318 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span> @@ -384,7 +384,7 @@ if ('onhashchange' in window) { <span id="L320" class="LineNr">320 </span>== <span class="Constant">0x1</span> <span id="L321" class="LineNr">321 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L322" class="LineNr">322 </span> 3d 0a 0b 0c 0d <span class="Comment"># compare 0x0d0c0b0a with EAX</span> -<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: compare EAX and imm32 0x0d0c0b0a</span> +<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span> <span id="L324" class="LineNr">324 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span> <span id="L325" class="LineNr">325 </span> <span id="L326" class="LineNr">326 </span><span class="Comment">//:</span> @@ -396,19 +396,19 @@ if ('onhashchange' in window) { <span id="L332" class="LineNr">332 </span> <span class="Constant">81</span> fb <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d <span class="Comment"># compare 0x0d0c0b07 with EBX</span> <span id="L333" class="LineNr">333 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span> <span id="L334" class="LineNr">334 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L335" class="LineNr">335 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L335" class="LineNr">335 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L336" class="LineNr">336 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span> <span id="L337" class="LineNr">337 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span> <span id="L338" class="LineNr">338 </span> <span id="L339" class="LineNr">339 </span><span class="Delimiter">:(before "End Op 81 Subops")</span> <span id="L340" class="LineNr">340 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span> -<span id="L341" class="LineNr">341 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop compare"</span> << end<span class="Delimiter">();</span> +<span id="L341" class="LineNr">341 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"subop compare"</span> << end<span class="Delimiter">();</span> <span id="L342" class="LineNr">342 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span> <span id="L343" class="LineNr">343 </span> SF = <span class="Delimiter">(</span>tmp1 < <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L344" class="LineNr">344 </span> ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L345" class="LineNr">345 </span> <span class="Normal">const</span> <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span> -<span id="L346" class="LineNr">346 </span> OF = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> -<span id="L347" class="LineNr">347 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << OF << end<span class="Delimiter">();</span> +<span id="L346" class="LineNr">346 </span> <a href='010---vm.cc.html#L81'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span> +<span id="L347" class="LineNr">347 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"SF="</span> << SF << <span class="Constant">"; ZF="</span> << ZF << <span class="Constant">"; OF="</span> << <a href='010---vm.cc.html#L81'>OF</a> << end<span class="Delimiter">();</span> <span id="L348" class="LineNr">348 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span> <span id="L350" class="LineNr">350 </span> @@ -419,7 +419,7 @@ if ('onhashchange' in window) { <span id="L355" class="LineNr">355 </span> <span class="Constant">81</span> fb 0a 0b 0c 0d <span class="Comment"># compare 0x0d0c0b0a with EBX</span> <span id="L356" class="LineNr">356 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span> <span id="L357" class="LineNr">357 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L359" class="LineNr">359 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span> <span id="L360" class="LineNr">360 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span> <span id="L361" class="LineNr">361 </span> @@ -430,7 +430,7 @@ if ('onhashchange' in window) { <span id="L366" class="LineNr">366 </span> <span class="Constant">81</span> fb 0a 0b 0c 0d <span class="Comment"># compare 0x0d0c0b0a with EBX</span> <span id="L367" class="LineNr">367 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span> <span id="L368" class="LineNr">368 </span><span class="traceContains">+run: combine imm32 with r/m32</span> -<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: r/m32 is EBX</span> +<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L370" class="LineNr">370 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span> <span id="L371" class="LineNr">371 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span> <span id="L372" class="LineNr">372 </span> @@ -477,20 +477,20 @@ if ('onhashchange' in window) { <span id="L413" class="LineNr">413 </span><span class="SalientComment">//:: copy (mov)</span> <span id="L414" class="LineNr">414 </span> <span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L416" class="LineNr">416 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"b8"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to EAX (mov)"</span><span class="Delimiter">);</span> -<span id="L417" class="LineNr">417 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"b9"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to ECX (mov)"</span><span class="Delimiter">);</span> -<span id="L418" class="LineNr">418 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"ba"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to EDX (mov)"</span><span class="Delimiter">);</span> -<span id="L419" class="LineNr">419 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"bb"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to EBX (mov)"</span><span class="Delimiter">);</span> -<span id="L420" class="LineNr">420 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"bc"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to ESP (mov)"</span><span class="Delimiter">);</span> -<span id="L421" class="LineNr">421 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"bd"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to EBP (mov)"</span><span class="Delimiter">);</span> -<span id="L422" class="LineNr">422 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"be"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to ESI (mov)"</span><span class="Delimiter">);</span> -<span id="L423" class="LineNr">423 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"bf"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to EDI (mov)"</span><span class="Delimiter">);</span> +<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"b8"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"b9"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L418" class="LineNr">418 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"ba"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"bb"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L420" class="LineNr">420 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"bc"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L421" class="LineNr">421 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"bd"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"be"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)"</span><span class="Delimiter">);</span> +<span id="L423" class="LineNr">423 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"bf"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)"</span><span class="Delimiter">);</span> <span id="L424" class="LineNr">424 </span> <span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span> <span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span> <span id="L427" class="LineNr">427 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L428" class="LineNr">428 </span> bb 0a 0b 0c 0d <span class="Comment"># copy 0x0d0c0b0a to EBX</span> -<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: copy imm32 0x0d0c0b0a to EBX</span> +<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: copy imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L430" class="LineNr">430 </span> <span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L432" class="LineNr">432 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>: @@ -502,8 +502,8 @@ if ('onhashchange' in window) { <span id="L438" class="LineNr">438 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>: <span id="L439" class="LineNr">439 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span> <span class="Comment">// copy imm32 to r32</span> <span id="L440" class="LineNr">440 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op & <span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L441" class="LineNr">441 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> src = next32<span class="Delimiter">();</span> -<span id="L442" class="LineNr">442 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy imm32 0x"</span> << HEXWORD << src << <span class="Constant">" to "</span> << rname<span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L441" class="LineNr">441 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L442" class="LineNr">442 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << src << <span class="Constant">" to "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L443" class="LineNr">443 </span> Reg[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span> <span id="L444" class="LineNr">444 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span> @@ -511,7 +511,7 @@ if ('onhashchange' in window) { <span id="L447" class="LineNr">447 </span><span class="Comment">//:</span> <span id="L448" class="LineNr">448 </span> <span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L450" class="LineNr">450 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"c7"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to rm32 (mov)"</span><span class="Delimiter">);</span> +<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"c7"</span><span class="Delimiter">,</span> <span class="Constant">"copy imm32 to rm32 (mov)"</span><span class="Delimiter">);</span> <span id="L451" class="LineNr">451 </span> <span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span> <span id="L453" class="LineNr">453 </span><span class="Special">% Reg[EBX].i = 0x60;</span> @@ -525,11 +525,11 @@ if ('onhashchange' in window) { <span id="L461" class="LineNr">461 </span> <span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L463" class="LineNr">463 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span> <span class="Comment">// copy imm32 to r32</span> -<span id="L464" class="LineNr">464 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> -<span id="L465" class="LineNr">465 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy imm32 to r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L466" class="LineNr">466 </span> <span class="Normal">int32_t</span>* dest = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L467" class="LineNr">467 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> src = next32<span class="Delimiter">();</span> -<span id="L468" class="LineNr">468 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"imm32 is 0x"</span> << HEXWORD << src << end<span class="Delimiter">();</span> +<span id="L464" class="LineNr">464 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> +<span id="L465" class="LineNr">465 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy imm32 to r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L466" class="LineNr">466 </span> <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L467" class="LineNr">467 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L468" class="LineNr">468 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"imm32 is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << src << end<span class="Delimiter">();</span> <span id="L469" class="LineNr">469 </span> *dest = src<span class="Delimiter">;</span> <span id="L470" class="LineNr">470 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span> @@ -537,25 +537,25 @@ if ('onhashchange' in window) { <span id="L473" class="LineNr">473 </span><span class="SalientComment">//:: push</span> <span id="L474" class="LineNr">474 </span> <span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L476" class="LineNr">476 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"68"</span><span class="Delimiter">,</span> <span class="Constant">"push imm32 to stack (push)"</span><span class="Delimiter">);</span> +<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"68"</span><span class="Delimiter">,</span> <span class="Constant">"push imm32 to stack (push)"</span><span class="Delimiter">);</span> <span id="L477" class="LineNr">477 </span> <span id="L478" class="LineNr">478 </span><span class="Delimiter">:(scenario push_imm32)</span> <span id="L479" class="LineNr">479 </span><span class="Special">% Reg[ESP].u = 0x14;</span> <span id="L480" class="LineNr">480 </span>== <span class="Constant">0x1</span> <span id="L481" class="LineNr">481 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L482" class="LineNr">482 </span> <span class="Constant">68</span> af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># push *EAX to stack</span> -<span id="L483" class="LineNr">483 </span><span class="traceContains">+run: push imm32 0x000000af</span> -<span id="L484" class="LineNr">484 </span><span class="traceContains">+run: ESP is now 0x00000010</span> -<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: contents at ESP: 0x000000af</span> +<span id="L483" class="LineNr">483 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> imm32 0x000000af</span> +<span id="L484" class="LineNr">484 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span> +<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span> <span id="L486" class="LineNr">486 </span> <span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L488" class="LineNr">488 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span> -<span id="L489" class="LineNr">489 </span> <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span>next32<span class="Delimiter">());</span> -<span id="L490" class="LineNr">490 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"push imm32 0x"</span> << HEXWORD << val << end<span class="Delimiter">();</span> +<span id="L489" class="LineNr">489 </span> <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span> +<span id="L490" class="LineNr">490 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"push imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << val << end<span class="Delimiter">();</span> <span id="L491" class="LineNr">491 </span><span class="CommentedCode">//? cerr << "push: " << val << " => " << Reg[ESP].u << '\n';</span> -<span id="L492" class="LineNr">492 </span> push<span class="Delimiter">(</span>val<span class="Delimiter">);</span> -<span id="L493" class="LineNr">493 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"ESP is now 0x"</span> << HEXWORD << Reg[ESP]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L494" class="LineNr">494 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"contents at ESP: 0x"</span> << HEXWORD << read_mem_u32<span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L492" class="LineNr">492 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span> +<span id="L493" class="LineNr">493 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"ESP is now 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[ESP]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L494" class="LineNr">494 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L495" class="LineNr">495 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L496" class="LineNr">496 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html index b2f8426d..6d7e3151 100644 --- a/html/subx/016index_addressing.cc.html +++ b/html/subx/016index_addressing.cc.html @@ -72,38 +72,38 @@ if ('onhashchange' in window) { <span id="L10" class="LineNr"> 10 </span><span class="Comment"># SIB in binary: 00 (scale 1) 100 (no index) 000 (base EAX)</span> <span id="L11" class="LineNr"> 11 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L12" class="LineNr"> 12 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: effective address is initially 0x00002000 (EAX)</span> <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: effective address is 0x00002000</span> <span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: storing 0x00000011</span> <span id="L17" class="LineNr"> 17 </span> <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before "End Mod 0 Special-cases(addr)")</span> <span id="L19" class="LineNr"> 19 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Comment">// exception: mod 0b00 rm 0b100 => incoming SIB (scale-index-base) byte</span> -<span id="L20" class="LineNr"> 20 </span> addr = effective_address_from_sib<span class="Delimiter">(</span>mod<span class="Delimiter">);</span> +<span id="L20" class="LineNr"> 20 </span> addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span> <span id="L21" class="LineNr"> 21 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(code)</span> -<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> effective_address_from_sib<span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L24" class="LineNr"> 24 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> sib = next<span class="Delimiter">();</span> +<span id="L23" class="LineNr"> 23 </span><span class="Normal">uint32_t</span> <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> mod<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L24" class="LineNr"> 24 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> sib = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L25" class="LineNr"> 25 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> base = sib&<span class="Constant">0x7</span><span class="Delimiter">;</span> <span id="L26" class="LineNr"> 26 </span> <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>base != EBP || mod != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>base != <a href='010---vm.cc.html#L18'>EBP</a> || mod != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L28" class="LineNr"> 28 </span> addr = Reg[base]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> -<span id="L29" class="LineNr"> 29 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << HEXWORD << addr << <span class="Constant">" ("</span> << rname<span class="Delimiter">(</span>base<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> +<span id="L29" class="LineNr"> 29 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" ("</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>base<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> <span id="L30" class="LineNr"> 30 </span> <span class="Delimiter">}</span> <span id="L31" class="LineNr"> 31 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> <span id="L32" class="LineNr"> 32 </span> <span class="Comment">// base == EBP && mod == 0</span> -<span id="L33" class="LineNr"> 33 </span> addr = next32<span class="Delimiter">();</span> <span class="Comment">// ignore base</span> -<span id="L34" class="LineNr"> 34 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << HEXWORD << addr << <span class="Constant">" (disp32)"</span> << end<span class="Delimiter">();</span> +<span id="L33" class="LineNr"> 33 </span> addr = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> <span class="Comment">// ignore base</span> +<span id="L34" class="LineNr"> 34 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is initially 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" (disp32)"</span> << end<span class="Delimiter">();</span> <span id="L35" class="LineNr"> 35 </span> <span class="Delimiter">}</span> <span id="L36" class="LineNr"> 36 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L37" class="LineNr"> 37 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>index == ESP<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L37" class="LineNr"> 37 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>index == <a href='010---vm.cc.html#L17'>ESP</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L38" class="LineNr"> 38 </span> <span class="Comment">// ignore index and scale</span> -<span id="L39" class="LineNr"> 39 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << HEXWORD << addr << end<span class="Delimiter">();</span> +<span id="L39" class="LineNr"> 39 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << end<span class="Delimiter">();</span> <span id="L40" class="LineNr"> 40 </span> <span class="Delimiter">}</span> <span id="L41" class="LineNr"> 41 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> <span id="L42" class="LineNr"> 42 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> scale = <span class="Delimiter">(</span><span class="Constant">1</span> << <span class="Delimiter">(</span>sib>><span class="Constant">6</span><span class="Delimiter">));</span> <span id="L43" class="LineNr"> 43 </span> addr += Reg[index]<span class="Delimiter">.</span>i*scale<span class="Delimiter">;</span> <span class="Comment">// treat index register as signed. Maybe base as well? But we'll always ensure it's non-negative.</span> -<span id="L44" class="LineNr"> 44 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << HEXWORD << addr << <span class="Constant">" (after adding "</span> << rname<span class="Delimiter">(</span>index<span class="Delimiter">)</span> << <span class="Constant">"*"</span> << NUM<span class="Delimiter">(</span>scale<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> +<span id="L44" class="LineNr"> 44 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"effective address is 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << addr << <span class="Constant">" (after adding "</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>index<span class="Delimiter">)</span> << <span class="Constant">"*"</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>scale<span class="Delimiter">)</span> << <span class="Constant">")"</span> << end<span class="Delimiter">();</span> <span id="L45" class="LineNr"> 45 </span> <span class="Delimiter">}</span> <span id="L46" class="LineNr"> 46 </span> <span class="Identifier">return</span> addr<span class="Delimiter">;</span> <span id="L47" class="LineNr"> 47 </span><span class="Delimiter">}</span> @@ -119,7 +119,7 @@ if ('onhashchange' in window) { <span id="L57" class="LineNr"> 57 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span> <span id="L58" class="LineNr"> 58 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L59" class="LineNr"> 59 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L60" class="LineNr"> 60 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L60" class="LineNr"> 60 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L61" class="LineNr"> 61 </span><span class="traceContains">+run: effective address is initially 0x00001ffe (EAX)</span> <span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding ECX*1)</span> <span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: storing 0x00000011</span> @@ -133,7 +133,7 @@ if ('onhashchange' in window) { <span id="L71" class="LineNr"> 71 </span><span class="Comment"># SIB in binary: 00 (scale 1) 100 (no index) 101 (not EBP but disp32)</span> <span id="L72" class="LineNr"> 72 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L73" class="LineNr"> 73 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L75" class="LineNr"> 75 </span><span class="traceContains">+run: effective address is initially 0x00002000 (disp32)</span> <span id="L76" class="LineNr"> 76 </span><span class="traceContains">+run: effective address is 0x00002000</span> <span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: storing 0x00000011</span> @@ -151,7 +151,7 @@ if ('onhashchange' in window) { <span id="L89" class="LineNr"> 89 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span> <span id="L90" class="LineNr"> 90 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L91" class="LineNr"> 91 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L92" class="LineNr"> 92 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L93" class="LineNr"> 93 </span><span class="traceContains">+run: effective address is initially 0x00001ff9 (EAX)</span> <span id="L94" class="LineNr"> 94 </span><span class="traceContains">+run: effective address is 0x00001ffe (after adding ECX*1)</span> <span id="L95" class="LineNr"> 95 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp8)</span> @@ -159,7 +159,7 @@ if ('onhashchange' in window) { <span id="L97" class="LineNr"> 97 </span> <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(before "End Mod 1 Special-cases(addr)")</span> <span id="L99" class="LineNr"> 99 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Comment">// exception: mod 0b01 rm 0b100 => incoming SIB (scale-index-base) byte</span> -<span id="L100" class="LineNr">100 </span> addr = effective_address_from_sib<span class="Delimiter">(</span>mod<span class="Delimiter">);</span> +<span id="L100" class="LineNr">100 </span> addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span> <span id="L101" class="LineNr">101 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L102" class="LineNr">102 </span> <span id="L103" class="LineNr">103 </span><span class="Comment">//:</span> @@ -175,7 +175,7 @@ if ('onhashchange' in window) { <span id="L113" class="LineNr">113 </span><span class="Comment"># SIB in binary: 00 (scale 1) 001 (index ECX) 000 (base EAX)</span> <span id="L114" class="LineNr">114 </span>== <span class="Constant">0x2000</span> <span class="Comment"># data segment</span> <span id="L115" class="LineNr">115 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 1</span> -<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: add EBX to r/m32</span> +<span id="L116" class="LineNr">116 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span> <span id="L117" class="LineNr">117 </span><span class="traceContains">+run: effective address is initially 0x00001ff9 (EAX)</span> <span id="L118" class="LineNr">118 </span><span class="traceContains">+run: effective address is 0x00001ffe (after adding ECX*1)</span> <span id="L119" class="LineNr">119 </span><span class="traceContains">+run: effective address is 0x00002000 (after adding disp32)</span> @@ -183,7 +183,7 @@ if ('onhashchange' in window) { <span id="L121" class="LineNr">121 </span> <span id="L122" class="LineNr">122 </span><span class="Delimiter">:(before "End Mod 2 Special-cases(addr)")</span> <span id="L123" class="LineNr">123 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Comment">// exception: mod 0b10 rm 0b100 => incoming SIB (scale-index-base) byte</span> -<span id="L124" class="LineNr">124 </span> addr = effective_address_from_sib<span class="Delimiter">(</span>mod<span class="Delimiter">);</span> +<span id="L124" class="LineNr">124 </span> addr = <a href='016index_addressing.cc.html#L23'>effective_address_from_sib</a><span class="Delimiter">(</span>mod<span class="Delimiter">);</span> <span id="L125" class="LineNr">125 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> </pre> </body> diff --git a/html/subx/017jump_disp8.cc.html b/html/subx/017jump_disp8.cc.html index d815d46a..efe6fb15 100644 --- a/html/subx/017jump_disp8.cc.html +++ b/html/subx/017jump_disp8.cc.html @@ -66,7 +66,7 @@ if ('onhashchange' in window) { <span id="L3" class="LineNr"> 3 </span><span class="SalientComment">//:: jump</span> <span id="L4" class="LineNr"> 4 </span> <span id="L5" class="LineNr"> 5 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L6" class="LineNr"> 6 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"eb"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away (jmp)"</span><span class="Delimiter">);</span> +<span id="L6" class="LineNr"> 6 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"eb"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away (jmp)"</span><span class="Delimiter">);</span> <span id="L7" class="LineNr"> 7 </span> <span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(scenario jump_rel8)</span> <span id="L9" class="LineNr"> 9 </span>== <span class="Constant">0x1</span> @@ -81,16 +81,16 @@ if ('onhashchange' in window) { <span id="L18" class="LineNr"> 18 </span> <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xeb</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8</span> -<span id="L21" class="LineNr"> 21 </span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> -<span id="L22" class="LineNr"> 22 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L23" class="LineNr"> 23 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L21" class="LineNr"> 21 </span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> +<span id="L22" class="LineNr"> 22 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L23" class="LineNr"> 23 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L24" class="LineNr"> 24 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span> <span id="L26" class="LineNr"> 26 </span> <span id="L27" class="LineNr"> 27 </span><span class="SalientComment">//:: jump if equal/zero</span> <span id="L28" class="LineNr"> 28 </span> <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L30" class="LineNr"> 30 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"74"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if equal, if ZF is set (jcc/jz/je)"</span><span class="Delimiter">);</span> +<span id="L30" class="LineNr"> 30 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"74"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if equal, if ZF is set (jcc/jz/je)"</span><span class="Delimiter">);</span> <span id="L31" class="LineNr"> 31 </span> <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(scenario je_rel8_success)</span> <span id="L33" class="LineNr"> 33 </span><span class="Special">% ZF = true;</span> @@ -106,10 +106,10 @@ if ('onhashchange' in window) { <span id="L43" class="LineNr"> 43 </span> <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L45" class="LineNr"> 45 </span><span class="Normal">case</span> <span class="Constant">0x74</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8 if ZF</span> -<span id="L46" class="LineNr"> 46 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> +<span id="L46" class="LineNr"> 46 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> <span id="L47" class="LineNr"> 47 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L48" class="LineNr"> 48 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L49" class="LineNr"> 49 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L48" class="LineNr"> 48 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L49" class="LineNr"> 49 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L50" class="LineNr"> 50 </span> <span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L52" class="LineNr"> 52 </span><span class="Delimiter">}</span> @@ -129,7 +129,7 @@ if ('onhashchange' in window) { <span id="L66" class="LineNr"> 66 </span><span class="SalientComment">//:: jump if not equal/not zero</span> <span id="L67" class="LineNr"> 67 </span> <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L69" class="LineNr"> 69 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"75"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if not equal, if ZF is not set (jcc/jnz/jne)"</span><span class="Delimiter">);</span> +<span id="L69" class="LineNr"> 69 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"75"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if not equal, if ZF is not set (jcc/jnz/jne)"</span><span class="Delimiter">);</span> <span id="L70" class="LineNr"> 70 </span> <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(scenario jne_rel8_success)</span> <span id="L72" class="LineNr"> 72 </span><span class="Special">% ZF = false;</span> @@ -145,10 +145,10 @@ if ('onhashchange' in window) { <span id="L82" class="LineNr"> 82 </span> <span id="L83" class="LineNr"> 83 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L84" class="LineNr"> 84 </span><span class="Normal">case</span> <span class="Constant">0x75</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8 unless ZF</span> -<span id="L85" class="LineNr"> 85 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> +<span id="L85" class="LineNr"> 85 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> <span id="L86" class="LineNr"> 86 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L87" class="LineNr"> 87 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L88" class="LineNr"> 88 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L87" class="LineNr"> 87 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L88" class="LineNr"> 88 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L89" class="LineNr"> 89 </span> <span class="Delimiter">}</span> <span id="L90" class="LineNr"> 90 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span> @@ -168,12 +168,12 @@ if ('onhashchange' in window) { <span id="L105" class="LineNr">105 </span><span class="SalientComment">//:: jump if greater</span> <span id="L106" class="LineNr">106 </span> <span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L108" class="LineNr">108 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"7f"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if greater, if ZF is unset and SF == OF (jcc/jg/jnle)"</span><span class="Delimiter">);</span> +<span id="L108" class="LineNr">108 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"7f"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)"</span><span class="Delimiter">);</span> <span id="L109" class="LineNr">109 </span> <span id="L110" class="LineNr">110 </span><span class="Delimiter">:(scenario jg_rel8_success)</span> <span id="L111" class="LineNr">111 </span><span class="Special">% ZF = false;</span> <span id="L112" class="LineNr">112 </span><span class="Special">% SF = false;</span> -<span id="L113" class="LineNr">113 </span><span class="Special">% OF = false;</span> +<span id="L113" class="LineNr">113 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L114" class="LineNr">114 </span>== <span class="Constant">0x1</span> <span id="L115" class="LineNr">115 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L116" class="LineNr">116 </span> <span class="Constant">7f</span> <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -186,10 +186,10 @@ if ('onhashchange' in window) { <span id="L123" class="LineNr">123 </span> <span id="L124" class="LineNr">124 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L125" class="LineNr">125 </span><span class="Normal">case</span> <span class="Constant">0x7f</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8 if !SF and !ZF</span> -<span id="L126" class="LineNr">126 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> -<span id="L127" class="LineNr">127 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF && SF == OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L128" class="LineNr">128 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L129" class="LineNr">129 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L126" class="LineNr">126 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> +<span id="L127" class="LineNr">127 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF && SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L128" class="LineNr">128 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L129" class="LineNr">129 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L130" class="LineNr">130 </span> <span class="Delimiter">}</span> <span id="L131" class="LineNr">131 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span> @@ -197,7 +197,7 @@ if ('onhashchange' in window) { <span id="L134" class="LineNr">134 </span><span class="Delimiter">:(scenario jg_rel8_fail)</span> <span id="L135" class="LineNr">135 </span><span class="Special">% ZF = false;</span> <span id="L136" class="LineNr">136 </span><span class="Special">% SF = true;</span> -<span id="L137" class="LineNr">137 </span><span class="Special">% OF = false;</span> +<span id="L137" class="LineNr">137 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L138" class="LineNr">138 </span>== <span class="Constant">0x1</span> <span id="L139" class="LineNr">139 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L140" class="LineNr">140 </span> <span class="Constant">7f</span> <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -211,11 +211,11 @@ if ('onhashchange' in window) { <span id="L148" class="LineNr">148 </span><span class="SalientComment">//:: jump if greater or equal</span> <span id="L149" class="LineNr">149 </span> <span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L151" class="LineNr">151 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"7d"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if greater or equal, if SF == OF (jcc/jge/jnl)"</span><span class="Delimiter">);</span> +<span id="L151" class="LineNr">151 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"7d"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)"</span><span class="Delimiter">);</span> <span id="L152" class="LineNr">152 </span> <span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario jge_rel8_success)</span> <span id="L154" class="LineNr">154 </span><span class="Special">% SF = false;</span> -<span id="L155" class="LineNr">155 </span><span class="Special">% OF = false;</span> +<span id="L155" class="LineNr">155 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L156" class="LineNr">156 </span>== <span class="Constant">0x1</span> <span id="L157" class="LineNr">157 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L158" class="LineNr">158 </span> 7d <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -228,17 +228,17 @@ if ('onhashchange' in window) { <span id="L165" class="LineNr">165 </span> <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L167" class="LineNr">167 </span><span class="Normal">case</span> <span class="Constant">0x7d</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8 if !SF</span> -<span id="L168" class="LineNr">168 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> -<span id="L169" class="LineNr">169 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF == OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L170" class="LineNr">170 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L171" class="LineNr">171 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L168" class="LineNr">168 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> +<span id="L169" class="LineNr">169 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L170" class="LineNr">170 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L171" class="LineNr">171 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L172" class="LineNr">172 </span> <span class="Delimiter">}</span> <span id="L173" class="LineNr">173 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L174" class="LineNr">174 </span><span class="Delimiter">}</span> <span id="L175" class="LineNr">175 </span> <span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario jge_rel8_fail)</span> <span id="L177" class="LineNr">177 </span><span class="Special">% SF = true;</span> -<span id="L178" class="LineNr">178 </span><span class="Special">% OF = false;</span> +<span id="L178" class="LineNr">178 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L179" class="LineNr">179 </span>== <span class="Constant">0x1</span> <span id="L180" class="LineNr">180 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L181" class="LineNr">181 </span> 7d <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -252,12 +252,12 @@ if ('onhashchange' in window) { <span id="L189" class="LineNr">189 </span><span class="SalientComment">//:: jump if lesser</span> <span id="L190" class="LineNr">190 </span> <span id="L191" class="LineNr">191 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L192" class="LineNr">192 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"7c"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if lesser, if SF != OF (jcc/jl/jnge)"</span><span class="Delimiter">);</span> +<span id="L192" class="LineNr">192 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"7c"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)"</span><span class="Delimiter">);</span> <span id="L193" class="LineNr">193 </span> <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario jl_rel8_success)</span> <span id="L195" class="LineNr">195 </span><span class="Special">% ZF = false;</span> <span id="L196" class="LineNr">196 </span><span class="Special">% SF = true;</span> -<span id="L197" class="LineNr">197 </span><span class="Special">% OF = false;</span> +<span id="L197" class="LineNr">197 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L198" class="LineNr">198 </span>== <span class="Constant">0x1</span> <span id="L199" class="LineNr">199 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L200" class="LineNr">200 </span> 7c <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -270,10 +270,10 @@ if ('onhashchange' in window) { <span id="L207" class="LineNr">207 </span> <span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">0x7c</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8 if SF and !ZF</span> -<span id="L210" class="LineNr">210 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> -<span id="L211" class="LineNr">211 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF != OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L212" class="LineNr">212 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L213" class="LineNr">213 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L210" class="LineNr">210 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> +<span id="L211" class="LineNr">211 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L212" class="LineNr">212 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L213" class="LineNr">213 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L214" class="LineNr">214 </span> <span class="Delimiter">}</span> <span id="L215" class="LineNr">215 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L216" class="LineNr">216 </span><span class="Delimiter">}</span> @@ -281,7 +281,7 @@ if ('onhashchange' in window) { <span id="L218" class="LineNr">218 </span><span class="Delimiter">:(scenario jl_rel8_fail)</span> <span id="L219" class="LineNr">219 </span><span class="Special">% ZF = false;</span> <span id="L220" class="LineNr">220 </span><span class="Special">% SF = false;</span> -<span id="L221" class="LineNr">221 </span><span class="Special">% OF = false;</span> +<span id="L221" class="LineNr">221 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L222" class="LineNr">222 </span>== <span class="Constant">0x1</span> <span id="L223" class="LineNr">223 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L224" class="LineNr">224 </span> 7c <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -295,12 +295,12 @@ if ('onhashchange' in window) { <span id="L232" class="LineNr">232 </span><span class="SalientComment">//:: jump if lesser or equal</span> <span id="L233" class="LineNr">233 </span> <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L235" class="LineNr">235 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"7e"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if lesser or equal, if ZF is set or SF != OF (jcc/jle/jng)"</span><span class="Delimiter">);</span> +<span id="L235" class="LineNr">235 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"7e"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp8 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)"</span><span class="Delimiter">);</span> <span id="L236" class="LineNr">236 </span> <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario jle_rel8_equal)</span> <span id="L238" class="LineNr">238 </span><span class="Special">% ZF = true;</span> <span id="L239" class="LineNr">239 </span><span class="Special">% SF = false;</span> -<span id="L240" class="LineNr">240 </span><span class="Special">% OF = false;</span> +<span id="L240" class="LineNr">240 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L241" class="LineNr">241 </span>== <span class="Constant">0x1</span> <span id="L242" class="LineNr">242 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L243" class="LineNr">243 </span> 7e <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -314,7 +314,7 @@ if ('onhashchange' in window) { <span id="L251" class="LineNr">251 </span><span class="Delimiter">:(scenario jle_rel8_lesser)</span> <span id="L252" class="LineNr">252 </span><span class="Special">% ZF = false;</span> <span id="L253" class="LineNr">253 </span><span class="Special">% SF = true;</span> -<span id="L254" class="LineNr">254 </span><span class="Special">% OF = false;</span> +<span id="L254" class="LineNr">254 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L255" class="LineNr">255 </span>== <span class="Constant">0x1</span> <span id="L256" class="LineNr">256 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L257" class="LineNr">257 </span> 7e <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> @@ -327,10 +327,10 @@ if ('onhashchange' in window) { <span id="L264" class="LineNr">264 </span> <span id="L265" class="LineNr">265 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L266" class="LineNr">266 </span><span class="Normal">case</span> <span class="Constant">0x7e</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8 if SF or ZF</span> -<span id="L267" class="LineNr">267 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span>next<span class="Delimiter">());</span> -<span id="L268" class="LineNr">268 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L269" class="LineNr">269 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L270" class="LineNr">270 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L267" class="LineNr">267 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <span class="Normal">static_cast</span><<span class="Normal">int</span>><span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">());</span> +<span id="L268" class="LineNr">268 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L269" class="LineNr">269 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L270" class="LineNr">270 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L271" class="LineNr">271 </span> <span class="Delimiter">}</span> <span id="L272" class="LineNr">272 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span> @@ -338,7 +338,7 @@ if ('onhashchange' in window) { <span id="L275" class="LineNr">275 </span><span class="Delimiter">:(scenario jle_rel8_greater)</span> <span id="L276" class="LineNr">276 </span><span class="Special">% ZF = false;</span> <span id="L277" class="LineNr">277 </span><span class="Special">% SF = false;</span> -<span id="L278" class="LineNr">278 </span><span class="Special">% OF = false;</span> +<span id="L278" class="LineNr">278 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L279" class="LineNr">279 </span>== <span class="Constant">0x1</span> <span id="L280" class="LineNr">280 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L281" class="LineNr">281 </span> 7e <span class="PreProc">0</span><span class="Constant">5</span> <span class="Comment"># skip 1 instruction</span> diff --git a/html/subx/018jump_disp16.cc.html b/html/subx/018jump_disp16.cc.html index 5b3d94b8..8ed26307 100644 --- a/html/subx/018jump_disp16.cc.html +++ b/html/subx/018jump_disp16.cc.html @@ -66,7 +66,7 @@ if ('onhashchange' in window) { <span id="L3" class="LineNr"> 3 </span><span class="SalientComment">//:: jump</span> <span id="L4" class="LineNr"> 4 </span> <span id="L5" class="LineNr"> 5 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L6" class="LineNr"> 6 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"e9"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away (jmp)"</span><span class="Delimiter">);</span> +<span id="L6" class="LineNr"> 6 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"e9"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away (jmp)"</span><span class="Delimiter">);</span> <span id="L7" class="LineNr"> 7 </span> <span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(scenario jump_rel16)</span> <span id="L9" class="LineNr"> 9 </span>== <span class="Constant">0x1</span> @@ -81,22 +81,22 @@ if ('onhashchange' in window) { <span id="L18" class="LineNr"> 18 </span> <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L20" class="LineNr"> 20 </span><span class="Normal">case</span> <span class="Constant">0xe9</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel8</span> -<span id="L21" class="LineNr"> 21 </span> <span class="Normal">const</span> <span class="Normal">int16_t</span> offset = imm16<span class="Delimiter">();</span> -<span id="L22" class="LineNr"> 22 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << offset << end<span class="Delimiter">();</span> -<span id="L23" class="LineNr"> 23 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L21" class="LineNr"> 21 </span> <span class="Normal">const</span> <span class="Normal">int16_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> +<span id="L22" class="LineNr"> 22 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << offset << end<span class="Delimiter">();</span> +<span id="L23" class="LineNr"> 23 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L24" class="LineNr"> 24 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">}</span> <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(code)</span> -<span id="L27" class="LineNr"> 27 </span><span class="Normal">int16_t</span> imm16<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L28" class="LineNr"> 28 </span> <span class="Normal">int16_t</span> result = next<span class="Delimiter">();</span> -<span id="L29" class="LineNr"> 29 </span> result |= <span class="Delimiter">(</span>next<span class="Delimiter">()</span><<<span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L27" class="LineNr"> 27 </span><span class="Normal">int16_t</span> <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L28" class="LineNr"> 28 </span> <span class="Normal">int16_t</span> result = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> +<span id="L29" class="LineNr"> 29 </span> result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">()</span><<<span class="Constant">8</span><span class="Delimiter">);</span> <span id="L30" class="LineNr"> 30 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span> <span id="L32" class="LineNr"> 32 </span> <span id="L33" class="LineNr"> 33 </span><span class="SalientComment">//:: jump if equal/zero</span> <span id="L34" class="LineNr"> 34 </span> <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L36" class="LineNr"> 36 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"84"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if equal, if ZF is set (jcc/jz/je)"</span><span class="Delimiter">);</span> +<span id="L36" class="LineNr"> 36 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"84"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if equal, if ZF is set (jcc/jz/je)"</span><span class="Delimiter">);</span> <span id="L37" class="LineNr"> 37 </span> <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">:(scenario je_rel16_success)</span> <span id="L39" class="LineNr"> 39 </span><span class="Special">% ZF = true;</span> @@ -112,10 +112,10 @@ if ('onhashchange' in window) { <span id="L49" class="LineNr"> 49 </span> <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L51" class="LineNr"> 51 </span><span class="Normal">case</span> <span class="Constant">0x84</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel16 if ZF</span> -<span id="L52" class="LineNr"> 52 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = imm16<span class="Delimiter">();</span> +<span id="L52" class="LineNr"> 52 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> <span id="L53" class="LineNr"> 53 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L54" class="LineNr"> 54 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L55" class="LineNr"> 55 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L54" class="LineNr"> 54 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L55" class="LineNr"> 55 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L56" class="LineNr"> 56 </span> <span class="Delimiter">}</span> <span id="L57" class="LineNr"> 57 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span> @@ -135,7 +135,7 @@ if ('onhashchange' in window) { <span id="L72" class="LineNr"> 72 </span><span class="SalientComment">//:: jump if not equal/not zero</span> <span id="L73" class="LineNr"> 73 </span> <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L75" class="LineNr"> 75 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"85"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if not equal, if ZF is not set (jcc/jnz/jne)"</span><span class="Delimiter">);</span> +<span id="L75" class="LineNr"> 75 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"85"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if not equal, if ZF is not set (jcc/jnz/jne)"</span><span class="Delimiter">);</span> <span id="L76" class="LineNr"> 76 </span> <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(scenario jne_rel16_success)</span> <span id="L78" class="LineNr"> 78 </span><span class="Special">% ZF = false;</span> @@ -151,10 +151,10 @@ if ('onhashchange' in window) { <span id="L88" class="LineNr"> 88 </span> <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L90" class="LineNr"> 90 </span><span class="Normal">case</span> <span class="Constant">0x85</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel16 unless ZF</span> -<span id="L91" class="LineNr"> 91 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = imm16<span class="Delimiter">();</span> +<span id="L91" class="LineNr"> 91 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> <span id="L92" class="LineNr"> 92 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L93" class="LineNr"> 93 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L94" class="LineNr"> 94 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L93" class="LineNr"> 93 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L94" class="LineNr"> 94 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L95" class="LineNr"> 95 </span> <span class="Delimiter">}</span> <span id="L96" class="LineNr"> 96 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span> @@ -174,12 +174,12 @@ if ('onhashchange' in window) { <span id="L111" class="LineNr">111 </span><span class="SalientComment">//:: jump if greater</span> <span id="L112" class="LineNr">112 </span> <span id="L113" class="LineNr">113 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L114" class="LineNr">114 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if greater, if ZF is unset and SF == OF (jcc/jg/jnle)"</span><span class="Delimiter">);</span> +<span id="L114" class="LineNr">114 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if greater, if ZF is unset and SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jg/jnle)"</span><span class="Delimiter">);</span> <span id="L115" class="LineNr">115 </span> <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(scenario jg_rel16_success)</span> <span id="L117" class="LineNr">117 </span><span class="Special">% ZF = false;</span> <span id="L118" class="LineNr">118 </span><span class="Special">% SF = false;</span> -<span id="L119" class="LineNr">119 </span><span class="Special">% OF = false;</span> +<span id="L119" class="LineNr">119 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L120" class="LineNr">120 </span>== <span class="Constant">0x1</span> <span id="L121" class="LineNr">121 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L122" class="LineNr">122 </span> <span class="Constant">0f</span> <span class="Constant">8f</span> <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -192,10 +192,10 @@ if ('onhashchange' in window) { <span id="L129" class="LineNr">129 </span> <span id="L130" class="LineNr">130 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L131" class="LineNr">131 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel16 if !SF and !ZF</span> -<span id="L132" class="LineNr">132 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = imm16<span class="Delimiter">();</span> -<span id="L133" class="LineNr">133 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF && SF == OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L134" class="LineNr">134 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L135" class="LineNr">135 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L132" class="LineNr">132 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> +<span id="L133" class="LineNr">133 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!ZF && SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L134" class="LineNr">134 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L135" class="LineNr">135 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L136" class="LineNr">136 </span> <span class="Delimiter">}</span> <span id="L137" class="LineNr">137 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L138" class="LineNr">138 </span><span class="Delimiter">}</span> @@ -203,7 +203,7 @@ if ('onhashchange' in window) { <span id="L140" class="LineNr">140 </span><span class="Delimiter">:(scenario jg_rel16_fail)</span> <span id="L141" class="LineNr">141 </span><span class="Special">% ZF = false;</span> <span id="L142" class="LineNr">142 </span><span class="Special">% SF = true;</span> -<span id="L143" class="LineNr">143 </span><span class="Special">% OF = false;</span> +<span id="L143" class="LineNr">143 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L144" class="LineNr">144 </span>== <span class="Constant">0x1</span> <span id="L145" class="LineNr">145 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L146" class="LineNr">146 </span> <span class="Constant">0f</span> <span class="Constant">8f</span> <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -217,11 +217,11 @@ if ('onhashchange' in window) { <span id="L154" class="LineNr">154 </span><span class="SalientComment">//:: jump if greater or equal</span> <span id="L155" class="LineNr">155 </span> <span id="L156" class="LineNr">156 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L157" class="LineNr">157 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if greater or equal, if SF == OF (jcc/jge/jnl)"</span><span class="Delimiter">);</span> +<span id="L157" class="LineNr">157 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if greater or equal, if SF == <a href='010---vm.cc.html#L81'>OF</a> (jcc/jge/jnl)"</span><span class="Delimiter">);</span> <span id="L158" class="LineNr">158 </span> <span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario jge_rel16_success)</span> <span id="L160" class="LineNr">160 </span><span class="Special">% SF = false;</span> -<span id="L161" class="LineNr">161 </span><span class="Special">% OF = false;</span> +<span id="L161" class="LineNr">161 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L162" class="LineNr">162 </span>== <span class="Constant">0x1</span> <span id="L163" class="LineNr">163 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L164" class="LineNr">164 </span> <span class="Constant">0f</span> 8d <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -234,17 +234,17 @@ if ('onhashchange' in window) { <span id="L171" class="LineNr">171 </span> <span id="L172" class="LineNr">172 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L173" class="LineNr">173 </span><span class="Normal">case</span> <span class="Constant">0x8d</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel16 if !SF</span> -<span id="L174" class="LineNr">174 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = imm16<span class="Delimiter">();</span> -<span id="L175" class="LineNr">175 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF == OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L176" class="LineNr">176 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L177" class="LineNr">177 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L174" class="LineNr">174 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> +<span id="L175" class="LineNr">175 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF == <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L176" class="LineNr">176 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L177" class="LineNr">177 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L178" class="LineNr">178 </span> <span class="Delimiter">}</span> <span id="L179" class="LineNr">179 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L180" class="LineNr">180 </span><span class="Delimiter">}</span> <span id="L181" class="LineNr">181 </span> <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(scenario jge_rel16_fail)</span> <span id="L183" class="LineNr">183 </span><span class="Special">% SF = true;</span> -<span id="L184" class="LineNr">184 </span><span class="Special">% OF = false;</span> +<span id="L184" class="LineNr">184 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L185" class="LineNr">185 </span>== <span class="Constant">0x1</span> <span id="L186" class="LineNr">186 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L187" class="LineNr">187 </span> <span class="Constant">0f</span> 8d <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -258,12 +258,12 @@ if ('onhashchange' in window) { <span id="L195" class="LineNr">195 </span><span class="SalientComment">//:: jump if lesser</span> <span id="L196" class="LineNr">196 </span> <span id="L197" class="LineNr">197 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L198" class="LineNr">198 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"8c"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if lesser, if SF != OF (jcc/jl/jnge)"</span><span class="Delimiter">);</span> +<span id="L198" class="LineNr">198 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"8c"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if lesser, if SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jl/jnge)"</span><span class="Delimiter">);</span> <span id="L199" class="LineNr">199 </span> <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario jl_rel16_success)</span> <span id="L201" class="LineNr">201 </span><span class="Special">% ZF = false;</span> <span id="L202" class="LineNr">202 </span><span class="Special">% SF = true;</span> -<span id="L203" class="LineNr">203 </span><span class="Special">% OF = false;</span> +<span id="L203" class="LineNr">203 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L204" class="LineNr">204 </span>== <span class="Constant">0x1</span> <span id="L205" class="LineNr">205 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L206" class="LineNr">206 </span> <span class="Constant">0f</span> 8c <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -276,10 +276,10 @@ if ('onhashchange' in window) { <span id="L213" class="LineNr">213 </span> <span id="L214" class="LineNr">214 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L215" class="LineNr">215 </span><span class="Normal">case</span> <span class="Constant">0x8c</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel16 if SF and !ZF</span> -<span id="L216" class="LineNr">216 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = imm16<span class="Delimiter">();</span> -<span id="L217" class="LineNr">217 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF != OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L218" class="LineNr">218 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L219" class="LineNr">219 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L216" class="LineNr">216 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> +<span id="L217" class="LineNr">217 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L218" class="LineNr">218 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L219" class="LineNr">219 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L220" class="LineNr">220 </span> <span class="Delimiter">}</span> <span id="L221" class="LineNr">221 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L222" class="LineNr">222 </span><span class="Delimiter">}</span> @@ -287,7 +287,7 @@ if ('onhashchange' in window) { <span id="L224" class="LineNr">224 </span><span class="Delimiter">:(scenario jl_rel16_fail)</span> <span id="L225" class="LineNr">225 </span><span class="Special">% ZF = false;</span> <span id="L226" class="LineNr">226 </span><span class="Special">% SF = false;</span> -<span id="L227" class="LineNr">227 </span><span class="Special">% OF = false;</span> +<span id="L227" class="LineNr">227 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L228" class="LineNr">228 </span>== <span class="Constant">0x1</span> <span id="L229" class="LineNr">229 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L230" class="LineNr">230 </span> <span class="Constant">0f</span> 8c <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -301,12 +301,12 @@ if ('onhashchange' in window) { <span id="L238" class="LineNr">238 </span><span class="SalientComment">//:: jump if lesser or equal</span> <span id="L239" class="LineNr">239 </span> <span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L241" class="LineNr">241 </span>put_new<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> <span class="Constant">"8e"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if lesser or equal, if ZF is set or SF != OF (jcc/jle/jng)"</span><span class="Delimiter">);</span> +<span id="L241" class="LineNr">241 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> <span class="Constant">"8e"</span><span class="Delimiter">,</span> <span class="Constant">"jump disp16 bytes away if lesser or equal, if ZF is set or SF != <a href='010---vm.cc.html#L81'>OF</a> (jcc/jle/jng)"</span><span class="Delimiter">);</span> <span id="L242" class="LineNr">242 </span> <span id="L243" class="LineNr">243 </span><span class="Delimiter">:(scenario jle_rel16_equal)</span> <span id="L244" class="LineNr">244 </span><span class="Special">% ZF = true;</span> <span id="L245" class="LineNr">245 </span><span class="Special">% SF = false;</span> -<span id="L246" class="LineNr">246 </span><span class="Special">% OF = false;</span> +<span id="L246" class="LineNr">246 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L247" class="LineNr">247 </span>== <span class="Constant">0x1</span> <span id="L248" class="LineNr">248 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L249" class="LineNr">249 </span> <span class="Constant">0f</span> 8e <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -320,7 +320,7 @@ if ('onhashchange' in window) { <span id="L257" class="LineNr">257 </span><span class="Delimiter">:(scenario jle_rel16_lesser)</span> <span id="L258" class="LineNr">258 </span><span class="Special">% ZF = false;</span> <span id="L259" class="LineNr">259 </span><span class="Special">% SF = true;</span> -<span id="L260" class="LineNr">260 </span><span class="Special">% OF = false;</span> +<span id="L260" class="LineNr">260 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L261" class="LineNr">261 </span>== <span class="Constant">0x1</span> <span id="L262" class="LineNr">262 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L263" class="LineNr">263 </span> <span class="Constant">0f</span> 8e <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> @@ -333,10 +333,10 @@ if ('onhashchange' in window) { <span id="L270" class="LineNr">270 </span> <span id="L271" class="LineNr">271 </span><span class="Delimiter">:(before "End Two-Byte Opcodes Starting With 0f")</span> <span id="L272" class="LineNr">272 </span><span class="Normal">case</span> <span class="Constant">0x8e</span>: <span class="Delimiter">{</span> <span class="Comment">// jump rel16 if SF or ZF</span> -<span id="L273" class="LineNr">273 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = imm16<span class="Delimiter">();</span> -<span id="L274" class="LineNr">274 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != OF<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L275" class="LineNr">275 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << NUM<span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L276" class="LineNr">276 </span> EIP += offset<span class="Delimiter">;</span> +<span id="L273" class="LineNr">273 </span> <span class="Normal">const</span> <span class="Normal">int8_t</span> offset = <a href='018jump_disp16.cc.html#L27'>imm16</a><span class="Delimiter">();</span> +<span id="L274" class="LineNr">274 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>ZF || SF != <a href='010---vm.cc.html#L81'>OF</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L275" class="LineNr">275 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jump "</span> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>offset<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L276" class="LineNr">276 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> <span id="L277" class="LineNr">277 </span> <span class="Delimiter">}</span> <span id="L278" class="LineNr">278 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L279" class="LineNr">279 </span><span class="Delimiter">}</span> @@ -344,7 +344,7 @@ if ('onhashchange' in window) { <span id="L281" class="LineNr">281 </span><span class="Delimiter">:(scenario jle_rel16_greater)</span> <span id="L282" class="LineNr">282 </span><span class="Special">% ZF = false;</span> <span id="L283" class="LineNr">283 </span><span class="Special">% SF = false;</span> -<span id="L284" class="LineNr">284 </span><span class="Special">% OF = false;</span> +<span id="L284" class="LineNr">284 </span><span class="Special">% <a href='010---vm.cc.html#L81'>OF</a> = false;</span> <span id="L285" class="LineNr">285 </span>== <span class="Constant">0x1</span> <span id="L286" class="LineNr">286 </span><span class="Comment"># op ModR/M SIB displacement immediate</span> <span id="L287" class="LineNr">287 </span> <span class="Constant">0f</span> 8e <span class="PreProc">0</span><span class="Constant">5</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># skip 1 instruction</span> diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html index 798d2652..4f3a1db0 100644 --- a/html/subx/019functions.cc.html +++ b/html/subx/019functions.cc.html @@ -64,7 +64,7 @@ if ('onhashchange' in window) { <span id="L1" class="LineNr"> 1 </span><span class="SalientComment">//:: call</span> <span id="L2" class="LineNr"> 2 </span> <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L4" class="LineNr"> 4 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"e8"</span><span class="Delimiter">,</span> <span class="Constant">"call <a href='subx.cc.html#L8324'>disp32</a> (call)"</span><span class="Delimiter">);</span> +<span id="L4" class="LineNr"> 4 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"e8"</span><span class="Delimiter">,</span> <span class="Constant">"call disp32 (call)"</span><span class="Delimiter">);</span> <span id="L5" class="LineNr"> 5 </span> <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(scenario call_disp32)</span> <span id="L7" class="LineNr"> 7 </span><span class="Special">% Reg[ESP].u = 0x64;</span> @@ -73,18 +73,18 @@ if ('onhashchange' in window) { <span id="L10" class="LineNr">10 </span> e8 a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># call function offset at 0x000000a0</span> <span id="L11" class="LineNr">11 </span> <span class="Comment"># next EIP is 6</span> <span id="L12" class="LineNr">12 </span><span class="traceContains">+run: call imm32 0x000000a0</span> -<span id="L13" class="LineNr">13 </span><span class="traceContains">+run: decrementing ESP to 0x00000060</span> +<span id="L13" class="LineNr">13 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span> <span id="L14" class="LineNr">14 </span><span class="traceContains">+run: pushing value 0x00000006</span> <span id="L15" class="LineNr">15 </span><span class="traceContains">+run: jumping to 0x000000a6</span> <span id="L16" class="LineNr">16 </span> <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span> <span class="Comment">// call disp32 relative to next EIP</span> -<span id="L19" class="LineNr">19 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = next32<span class="Delimiter">();</span> -<span id="L20" class="LineNr">20 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"call imm32 0x"</span> << HEXWORD << offset << end<span class="Delimiter">();</span> +<span id="L19" class="LineNr">19 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span> +<span id="L20" class="LineNr">20 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"call imm32 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << offset << end<span class="Delimiter">();</span> <span id="L21" class="LineNr">21 </span><span class="CommentedCode">//? cerr << "push: EIP: " << EIP << " => " << Reg[ESP].u << '\n';</span> -<span id="L22" class="LineNr">22 </span> push<span class="Delimiter">(</span>EIP<span class="Delimiter">);</span> -<span id="L23" class="LineNr">23 </span> EIP += offset<span class="Delimiter">;</span> -<span id="L24" class="LineNr">24 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << HEXWORD << EIP << end<span class="Delimiter">();</span> +<span id="L22" class="LineNr">22 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span> +<span id="L23" class="LineNr">23 </span> <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span> +<span id="L24" class="LineNr">24 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << end<span class="Delimiter">();</span> <span id="L25" class="LineNr">25 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L26" class="LineNr">26 </span><span class="Delimiter">}</span> <span id="L27" class="LineNr">27 </span> @@ -98,18 +98,18 @@ if ('onhashchange' in window) { <span id="L35" class="LineNr">35 </span> ff d3 <span class="Comment"># call function offset at EBX</span> <span id="L36" class="LineNr">36 </span> <span class="Comment"># next EIP is 3</span> <span id="L37" class="LineNr">37 </span><span class="traceContains">+run: call to r/m32</span> -<span id="L38" class="LineNr">38 </span><span class="traceContains">+run: r/m32 is EBX</span> -<span id="L39" class="LineNr">39 </span><span class="traceContains">+run: decrementing ESP to 0x00000060</span> +<span id="L38" class="LineNr">38 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span> +<span id="L39" class="LineNr">39 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span> <span id="L40" class="LineNr">40 </span><span class="traceContains">+run: pushing value 0x00000003</span> <span id="L41" class="LineNr">41 </span><span class="traceContains">+run: jumping to 0x000000a3</span> <span id="L42" class="LineNr">42 </span> <span id="L43" class="LineNr">43 </span><span class="Delimiter">:(before "End Op ff Subops")</span> <span id="L44" class="LineNr">44 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span> <span class="Comment">// call function pointer at r/m32</span> -<span id="L45" class="LineNr">45 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"call to r/m32"</span> << end<span class="Delimiter">();</span> -<span id="L46" class="LineNr">46 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* offset = effective_address<span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> -<span id="L47" class="LineNr">47 </span> push<span class="Delimiter">(</span>EIP<span class="Delimiter">);</span> -<span id="L48" class="LineNr">48 </span> EIP += *offset<span class="Delimiter">;</span> -<span id="L49" class="LineNr">49 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << HEXWORD << EIP << end<span class="Delimiter">();</span> +<span id="L45" class="LineNr">45 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"call to r/m32"</span> << end<span class="Delimiter">();</span> +<span id="L46" class="LineNr">46 </span> <span class="Normal">const</span> <span class="Normal">int32_t</span>* offset = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span> +<span id="L47" class="LineNr">47 </span> <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span> +<span id="L48" class="LineNr">48 </span> <a href='010---vm.cc.html#L29'>EIP</a> += *offset<span class="Delimiter">;</span> +<span id="L49" class="LineNr">49 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << end<span class="Delimiter">();</span> <span id="L50" class="LineNr">50 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span> <span id="L52" class="LineNr">52 </span> @@ -124,14 +124,14 @@ if ('onhashchange' in window) { <span id="L61" class="LineNr">61 </span>a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="Comment"># 0xa0</span> <span id="L62" class="LineNr">62 </span><span class="traceContains">+run: call to r/m32</span> <span id="L63" class="LineNr">63 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span> -<span id="L64" class="LineNr">64 </span><span class="traceContains">+run: decrementing ESP to 0x00000060</span> +<span id="L64" class="LineNr">64 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span> <span id="L65" class="LineNr">65 </span><span class="traceContains">+run: pushing value 0x00000003</span> <span id="L66" class="LineNr">66 </span><span class="traceContains">+run: jumping to 0x000000a3</span> <span id="L67" class="LineNr">67 </span> <span id="L68" class="LineNr">68 </span><span class="SalientComment">//:: ret</span> <span id="L69" class="LineNr">69 </span> <span id="L70" class="LineNr">70 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L71" class="LineNr">71 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"c3"</span><span class="Delimiter">,</span> <span class="Constant">"return from most recent unfinished call (ret)"</span><span class="Delimiter">);</span> +<span id="L71" class="LineNr">71 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"c3"</span><span class="Delimiter">,</span> <span class="Constant">"return from most recent unfinished call (ret)"</span><span class="Delimiter">);</span> <span id="L72" class="LineNr">72 </span> <span id="L73" class="LineNr">73 </span><span class="Delimiter">:(scenario ret)</span> <span id="L74" class="LineNr">74 </span><span class="Special">% Reg[ESP].u = 0x2000;</span> @@ -146,9 +146,9 @@ if ('onhashchange' in window) { <span id="L83" class="LineNr">83 </span> <span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span> <span class="Comment">// return from a call</span> -<span id="L86" class="LineNr">86 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"return"</span> << end<span class="Delimiter">();</span> -<span id="L87" class="LineNr">87 </span> EIP = pop<span class="Delimiter">();</span> -<span id="L88" class="LineNr">88 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << HEXWORD << EIP << end<span class="Delimiter">();</span> +<span id="L86" class="LineNr">86 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"return"</span> << end<span class="Delimiter">();</span> +<span id="L87" class="LineNr">87 </span> <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L630'>pop</a><span class="Delimiter">();</span> +<span id="L88" class="LineNr">88 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"jumping to 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << end<span class="Delimiter">();</span> <span id="L89" class="LineNr">89 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L90" class="LineNr">90 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/020syscalls.cc.html b/html/subx/020syscalls.cc.html index 4ca47a05..7dba5960 100644 --- a/html/subx/020syscalls.cc.html +++ b/html/subx/020syscalls.cc.html @@ -59,125 +59,125 @@ if ('onhashchange' in window) { <body onload='JumpToLine();'> <pre id='vimCodeElement'> <span id="L1" class="LineNr"> 1 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L2" class="LineNr"> 2 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"cd"</span><span class="Delimiter">,</span> <span class="Constant">"software interrupt (int)"</span><span class="Delimiter">);</span> +<span id="L2" class="LineNr"> 2 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"cd"</span><span class="Delimiter">,</span> <span class="Constant">"software interrupt (int)"</span><span class="Delimiter">);</span> <span id="L3" class="LineNr"> 3 </span> <span id="L4" class="LineNr"> 4 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L5" class="LineNr"> 5 </span><span class="Normal">case</span> <span class="Constant">0xcd</span>: <span class="Delimiter">{</span> <span class="Comment">// int imm8 (software interrupt)</span> -<span id="L6" class="LineNr"> 6 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"syscall"</span> << end<span class="Delimiter">();</span> -<span id="L7" class="LineNr"> 7 </span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L11'>code</a> = next<span class="Delimiter">();</span> +<span id="L6" class="LineNr"> 6 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"syscall"</span> << end<span class="Delimiter">();</span> +<span id="L7" class="LineNr"> 7 </span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L11'>code</a> = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L8" class="LineNr"> 8 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a> != <span class="Constant">0x80</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L9" class="LineNr"> 9 </span> raise << <span class="Constant">"Unimplemented interrupt <a href='031check_operands.cc.html#L11'>code</a> "</span> << HEXBYTE << <a href='031check_operands.cc.html#L11'>code</a> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> -<span id="L10" class="LineNr"> 10 </span> raise << <span class="Constant">" Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L9" class="LineNr"> 9 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"Unimplemented interrupt <a href='031check_operands.cc.html#L11'>code</a> "</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='031check_operands.cc.html#L11'>code</a> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L10" class="LineNr"> 10 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">" Only `int 80h` supported for now.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L11" class="LineNr"> 11 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L12" class="LineNr"> 12 </span> <span class="Delimiter">}</span> -<span id="L13" class="LineNr"> 13 </span> process_int80<span class="Delimiter">();</span> +<span id="L13" class="LineNr"> 13 </span> <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">();</span> <span id="L14" class="LineNr"> 14 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L15" class="LineNr"> 15 </span><span class="Delimiter">}</span> <span id="L16" class="LineNr"> 16 </span> <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(code)</span> -<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> process_int80<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L18" class="LineNr"> 18 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L18'>process_int80</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L19" class="LineNr"> 19 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L20" class="LineNr"> 20 </span> <span class="Normal">case</span> <span class="Constant">1</span>: <span id="L21" class="LineNr"> 21 </span> exit<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">exit <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> <span id="L22" class="LineNr"> 22 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L23" class="LineNr"> 23 </span> <span class="Normal">case</span> <span class="Constant">3</span>: -<span id="L24" class="LineNr"> 24 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"read: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[EDX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L25" class="LineNr"> 25 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_string<span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L26" class="LineNr"> 26 </span> Reg[EAX]<span class="Delimiter">.</span>i = read<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span>mem_addr_u8<span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> -<span id="L27" class="LineNr"> 27 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L28" class="LineNr"> 28 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L24" class="LineNr"> 24 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"read: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[EDX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L25" class="LineNr"> 25 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L246'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L26" class="LineNr"> 26 </span> Reg[EAX]<span class="Delimiter">.</span>i = read<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L27" class="LineNr"> 27 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L28" class="LineNr"> 28 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L29" class="LineNr"> 29 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L30" class="LineNr"> 30 </span> <span class="Normal">case</span> <span class="Constant">4</span>: -<span id="L31" class="LineNr"> 31 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"write: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[EDX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L32" class="LineNr"> 32 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_string<span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L33" class="LineNr"> 33 </span> Reg[EAX]<span class="Delimiter">.</span>i = write<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span>mem_addr_u8<span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> -<span id="L34" class="LineNr"> 34 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L35" class="LineNr"> 35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L31" class="LineNr"> 31 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"write: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[EDX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L32" class="LineNr"> 32 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L246'>mem_addr_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L33" class="LineNr"> 33 </span> Reg[EAX]<span class="Delimiter">.</span>i = write<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">memory buffer</span><span class="Comment">*/</span><a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">size</span><span class="Comment">*/</span>Reg[EDX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L34" class="LineNr"> 34 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L35" class="LineNr"> 35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L36" class="LineNr"> 36 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L37" class="LineNr"> 37 </span> <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span> -<span id="L38" class="LineNr"> 38 </span> check_flags<span class="Delimiter">(</span>ECX<span class="Delimiter">);</span> -<span id="L39" class="LineNr"> 39 </span> check_mode<span class="Delimiter">(</span>EDX<span class="Delimiter">);</span> -<span id="L40" class="LineNr"> 40 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"open: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[ECX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L41" class="LineNr"> 41 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L42" class="LineNr"> 42 </span> Reg[EAX]<span class="Delimiter">.</span>i = open<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span>mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">flags</span><span class="Comment">*/</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span> -<span id="L43" class="LineNr"> 43 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L38" class="LineNr"> 38 </span> <a href='020syscalls.cc.html#L94'>check_flags</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span> +<span id="L39" class="LineNr"> 39 </span> <a href='020syscalls.cc.html#L106'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L15'>EDX</a><span class="Delimiter">);</span> +<span id="L40" class="LineNr"> 40 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"open: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">' '</span> << Reg[ECX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L41" class="LineNr"> 41 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L42" class="LineNr"> 42 </span> Reg[EAX]<span class="Delimiter">.</span>i = open<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">flags</span><span class="Comment">*/</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span> +<span id="L43" class="LineNr"> 43 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L45" class="LineNr"> 45 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L46" class="LineNr"> 46 </span> <span class="Delimiter">}</span> <span id="L47" class="LineNr"> 47 </span> <span class="Normal">case</span> <span class="Constant">6</span>: -<span id="L48" class="LineNr"> 48 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"close: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L48" class="LineNr"> 48 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"close: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L49" class="LineNr"> 49 </span> Reg[EAX]<span class="Delimiter">.</span>i = close<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">file descriptor</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> -<span id="L50" class="LineNr"> 50 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L51" class="LineNr"> 51 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L50" class="LineNr"> 50 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L51" class="LineNr"> 51 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L52" class="LineNr"> 52 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L53" class="LineNr"> 53 </span> <span class="Normal">case</span> <span class="Constant">8</span>: -<span id="L54" class="LineNr"> 54 </span> check_mode<span class="Delimiter">(</span>ECX<span class="Delimiter">);</span> -<span id="L55" class="LineNr"> 55 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"creat: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L56" class="LineNr"> 56 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L57" class="LineNr"> 57 </span> Reg[EAX]<span class="Delimiter">.</span>i = creat<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span>mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span> -<span id="L58" class="LineNr"> 58 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L59" class="LineNr"> 59 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L54" class="LineNr"> 54 </span> <a href='020syscalls.cc.html#L106'>check_mode</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L14'>ECX</a><span class="Delimiter">);</span> +<span id="L55" class="LineNr"> 55 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"creat: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L56" class="LineNr"> 56 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L57" class="LineNr"> 57 </span> Reg[EAX]<span class="Delimiter">.</span>i = creat<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">mode</span><span class="Comment">*/</span><span class="PreProc">0</span><span class="Constant">640</span><span class="Delimiter">);</span> +<span id="L58" class="LineNr"> 58 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L59" class="LineNr"> 59 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L60" class="LineNr"> 60 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L61" class="LineNr"> 61 </span> <span class="Normal">case</span> <span class="Constant">10</span>: -<span id="L62" class="LineNr"> 62 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"unlink: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L63" class="LineNr"> 63 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L64" class="LineNr"> 64 </span> Reg[EAX]<span class="Delimiter">.</span>i = unlink<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span>mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span> -<span id="L65" class="LineNr"> 65 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L66" class="LineNr"> 66 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L62" class="LineNr"> 62 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"unlink: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L63" class="LineNr"> 63 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L64" class="LineNr"> 64 </span> Reg[EAX]<span class="Delimiter">.</span>i = unlink<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span> +<span id="L65" class="LineNr"> 65 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L66" class="LineNr"> 66 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L67" class="LineNr"> 67 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L68" class="LineNr"> 68 </span> <span class="Normal">case</span> <span class="Constant">38</span>: -<span id="L69" class="LineNr"> 69 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"rename: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" -> "</span> << Reg[ECX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L70" class="LineNr"> 70 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L71" class="LineNr"> 71 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << mem_addr_kernel_string<span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L72" class="LineNr"> 72 </span> Reg[EAX]<span class="Delimiter">.</span>i = rename<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">old filename</span><span class="Comment">*/</span>mem_addr_kernel_string<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">new filename</span><span class="Comment">*/</span>mem_addr_kernel_string<span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span> -<span id="L73" class="LineNr"> 73 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> -<span id="L74" class="LineNr"> 74 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> raise << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L69" class="LineNr"> 69 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"rename: "</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" -> "</span> << Reg[ECX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L70" class="LineNr"> 70 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[EBX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L71" class="LineNr"> 71 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << Reg[ECX]<span class="Delimiter">.</span>u << <span class="Constant">" => "</span> << <a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L72" class="LineNr"> 72 </span> Reg[EAX]<span class="Delimiter">.</span>i = rename<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">old filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">new filename</span><span class="Comment">*/</span><a href='010---vm.cc.html#L243'>mem_addr_kernel_string</a><span class="Delimiter">(</span>Reg[ECX]<span class="Delimiter">.</span>u<span class="Delimiter">));</span> +<span id="L73" class="LineNr"> 73 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>i << end<span class="Delimiter">();</span> +<span id="L74" class="LineNr"> 74 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[EAX]<span class="Delimiter">.</span>i == -<span class="Constant">1</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L210'>raise</a> << strerror<span class="Delimiter">(</span>errno<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L75" class="LineNr"> 75 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L76" class="LineNr"> 76 </span> <span class="Normal">case</span> <span class="Constant">45</span>: <span class="Comment">// brk: modify size of data segment</span> -<span id="L77" class="LineNr"> 77 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"grow data segment to "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> -<span id="L78" class="LineNr"> 78 </span> grow_data_segment<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new end address</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> +<span id="L77" class="LineNr"> 77 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"grow data segment to "</span> << Reg[EBX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L78" class="LineNr"> 78 </span> <a href='010---vm.cc.html#L180'>grow_data_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">new end address</span><span class="Comment">*/</span>Reg[EBX]<span class="Delimiter">.</span>u<span class="Delimiter">);</span> <span id="L79" class="LineNr"> 79 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L80" class="LineNr"> 80 </span> <span class="Normal">case</span> <span class="Constant">90</span>: <span class="Comment">// mmap: allocate memory outside existing segment allocations</span> -<span id="L81" class="LineNr"> 81 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"mmap: allocate new segment"</span> << end<span class="Delimiter">();</span> +<span id="L81" class="LineNr"> 81 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"mmap: allocate new segment"</span> << end<span class="Delimiter">();</span> <span id="L82" class="LineNr"> 82 </span> <span class="Comment">// Ignore most arguments for now: address hint, protection flags, sharing flags, fd, offset.</span> <span id="L83" class="LineNr"> 83 </span> <span class="Comment">// We only support anonymous maps.</span> -<span id="L84" class="LineNr"> 84 </span> Reg[EAX]<span class="Delimiter">.</span>u = new_segment<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">length</span><span class="Comment">*/</span>read_mem_u32<span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u+<span class="Constant">0x4</span><span class="Delimiter">));</span> -<span id="L85" class="LineNr"> 85 </span> trace<span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L84" class="LineNr"> 84 </span> Reg[EAX]<span class="Delimiter">.</span>u = <a href='020syscalls.cc.html#L117'>new_segment</a><span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">length</span><span class="Comment">*/</span><a href='010---vm.cc.html#L200'>read_mem_u32</a><span class="Delimiter">(</span>Reg[EBX]<span class="Delimiter">.</span>u+<span class="Constant">0x4</span><span class="Delimiter">));</span> +<span id="L85" class="LineNr"> 85 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">91</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"result: "</span> << Reg[EAX]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L86" class="LineNr"> 86 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L87" class="LineNr"> 87 </span> <span class="Normal">default</span>: -<span id="L88" class="LineNr"> 88 </span> raise << HEXWORD << EIP << <span class="Constant">": unimplemented syscall "</span> << Reg[EAX]<span class="Delimiter">.</span>u << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L88" class="LineNr"> 88 </span> <a href='003trace.cc.html#L210'>raise</a> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << <span class="Constant">": unimplemented syscall "</span> << Reg[EAX]<span class="Delimiter">.</span>u << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L89" class="LineNr"> 89 </span> <span class="Delimiter">}</span> <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span> <span id="L91" class="LineNr"> 91 </span> <span id="L92" class="LineNr"> 92 </span><span class="Comment">// SubX is oblivious to file permissions, directories, symbolic links, terminals, and much else besides.</span> <span id="L93" class="LineNr"> 93 </span><span class="Comment">// Also ignoring any concurrency considerations for now.</span> -<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> check_flags<span class="Delimiter">(</span><span class="Normal">int</span> reg<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L94'>check_flags</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L95" class="LineNr"> 95 </span> <span class="Normal">uint32_t</span> flags = Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">;</span> <span id="L96" class="LineNr"> 96 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>flags != <span class="Delimiter">((</span>flags & O_RDONLY<span class="Delimiter">)</span> | <span class="Delimiter">(</span>flags & O_WRONLY<span class="Delimiter">)))</span> <span class="Delimiter">{</span> -<span id="L97" class="LineNr"> 97 </span> cerr << HEXWORD << EIP << <span class="Constant">": most POSIX flags to the open() syscall are not supported. Just O_RDONLY and O_WRONLY for now. Zero concurrent access support.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L97" class="LineNr"> 97 </span> cerr << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << <span class="Constant">": most POSIX flags to the open() syscall are not supported. Just O_RDONLY and O_WRONLY for now. Zero concurrent access support.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L98" class="LineNr"> 98 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L99" class="LineNr"> 99 </span> <span class="Delimiter">}</span> <span id="L100" class="LineNr">100 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>flags & O_RDONLY<span class="Delimiter">)</span> && <span class="Delimiter">(</span>flags & O_WRONLY<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L101" class="LineNr">101 </span> cerr << HEXWORD << EIP << <span class="Constant">": can't open a file for both reading and writing at once. See <a href="http://man7.org/linux/man-pages/man2/open.2.html">http://man7.org/linux/man-pages/man2/open.2.html</a>.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L101" class="LineNr">101 </span> cerr << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << <span class="Constant">": can't open a file for both reading and writing at once. See <a href="http://man7.org/linux/man-pages/man2/open.2.html">http://man7.org/linux/man-pages/man2/open.2.html</a>.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L102" class="LineNr">102 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L103" class="LineNr">103 </span> <span class="Delimiter">}</span> <span id="L104" class="LineNr">104 </span><span class="Delimiter">}</span> <span id="L105" class="LineNr">105 </span> -<span id="L106" class="LineNr">106 </span><span class="Normal">void</span> check_mode<span class="Delimiter">(</span><span class="Normal">int</span> reg<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L106" class="LineNr">106 </span><span class="Normal">void</span> <a href='020syscalls.cc.html#L106'>check_mode</a><span class="Delimiter">(</span><span class="Normal">int</span> <a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L107" class="LineNr">107 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u != <span class="PreProc">0</span><span class="Constant">600</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L108" class="LineNr">108 </span> cerr << HEXWORD << EIP << <span class="Constant">": SubX is oblivious to file permissions; register "</span> << reg << <span class="Constant">" must be 0.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L108" class="LineNr">108 </span> cerr << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <a href='010---vm.cc.html#L29'>EIP</a> << <span class="Constant">": SubX is oblivious to file permissions; register "</span> << <a href='010---vm.cc.html#L23'>reg</a> << <span class="Constant">" must be 0.</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L109" class="LineNr">109 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L110" class="LineNr">110 </span> <span class="Delimiter">}</span> <span id="L111" class="LineNr">111 </span><span class="Delimiter">}</span> <span id="L112" class="LineNr">112 </span> <span id="L113" class="LineNr">113 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L114" class="LineNr">114 </span><span class="Normal">uint32_t</span> Next_segment = <span class="Constant">0xb0000000</span><span class="Delimiter">;</span> <span class="Comment">// 0xc0000000 and up is reserved for Linux kernel</span> -<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> SPACE_FOR_SEGMENT = <span class="Constant">0x01000000</span><span class="Delimiter">;</span> +<span id="L114" class="LineNr">114 </span><span class="Normal">uint32_t</span> <a href='020syscalls.cc.html#L114'>Next_segment</a> = <span class="Constant">0xb0000000</span><span class="Delimiter">;</span> <span class="Comment">// 0xc0000000 and up is reserved for Linux kernel</span> +<span id="L115" class="LineNr">115 </span><span class="Normal">const</span> <span class="Normal">uint32_t</span> <a href='020syscalls.cc.html#L115'>SPACE_FOR_SEGMENT</a> = <span class="Constant">0x01000000</span><span class="Delimiter">;</span> <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(code)</span> -<span id="L117" class="LineNr">117 </span><span class="Normal">uint32_t</span> new_segment<span class="Delimiter">(</span><span class="Normal">uint32_t</span> length<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L118" class="LineNr">118 </span> <span class="Normal">uint32_t</span> result = Next_segment<span class="Delimiter">;</span> -<span id="L119" class="LineNr">119 </span> Mem<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span>Next_segment<span class="Delimiter">,</span> Next_segment+length<span class="Delimiter">));</span> -<span id="L120" class="LineNr">120 </span> Next_segment -= SPACE_FOR_SEGMENT<span class="Delimiter">;</span> +<span id="L117" class="LineNr">117 </span><span class="Normal">uint32_t</span> <a href='020syscalls.cc.html#L117'>new_segment</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> length<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L118" class="LineNr">118 </span> <span class="Normal">uint32_t</span> result = <a href='020syscalls.cc.html#L114'>Next_segment</a><span class="Delimiter">;</span> +<span id="L119" class="LineNr">119 </span> <a href='010---vm.cc.html#L171'>Mem</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>vma<span class="Delimiter">(</span><a href='020syscalls.cc.html#L114'>Next_segment</a><span class="Delimiter">,</span> Next_segment+length<span class="Delimiter">));</span> +<span id="L120" class="LineNr">120 </span> <a href='020syscalls.cc.html#L114'>Next_segment</a> -= <a href='020syscalls.cc.html#L115'>SPACE_FOR_SEGMENT</a><span class="Delimiter">;</span> <span id="L121" class="LineNr">121 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L122" class="LineNr">122 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/021byte_addressing.cc.html b/html/subx/021byte_addressing.cc.html index b20ff4cb..a6b00dc7 100644 --- a/html/subx/021byte_addressing.cc.html +++ b/html/subx/021byte_addressing.cc.html @@ -65,7 +65,7 @@ if ('onhashchange' in window) { <span id="L4" class="LineNr"> 4 </span><span class="Comment">//: Unfortunately the register encodings when dealing with bytes are a mess.</span> <span id="L5" class="LineNr"> 5 </span><span class="Comment">//: We need a special case for them.</span> <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(code)</span> -<span id="L7" class="LineNr"> 7 </span>string rname_8bit<span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L7" class="LineNr"> 7 </span>string <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L8" class="LineNr"> 8 </span> <span class="Normal">switch</span> <span class="Delimiter">(</span>r<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L9" class="LineNr"> 9 </span> <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Identifier">return</span> <span class="Constant">"AL"</span><span class="Delimiter">;</span> <span class="Comment">// lowest byte of EAX</span> <span id="L10" class="LineNr"> 10 </span> <span class="Normal">case</span> <span class="Constant">1</span>: <span class="Identifier">return</span> <span class="Constant">"CL"</span><span class="Delimiter">;</span> <span class="Comment">// lowest byte of ECX</span> @@ -75,23 +75,23 @@ if ('onhashchange' in window) { <span id="L14" class="LineNr"> 14 </span> <span class="Normal">case</span> <span class="Constant">5</span>: <span class="Identifier">return</span> <span class="Constant">"CH"</span><span class="Delimiter">;</span> <span class="Comment">// second lowest byte of ECX</span> <span id="L15" class="LineNr"> 15 </span> <span class="Normal">case</span> <span class="Constant">6</span>: <span class="Identifier">return</span> <span class="Constant">"DH"</span><span class="Delimiter">;</span> <span class="Comment">// second lowest byte of EDX</span> <span id="L16" class="LineNr"> 16 </span> <span class="Normal">case</span> <span class="Constant">7</span>: <span class="Identifier">return</span> <span class="Constant">"BH"</span><span class="Delimiter">;</span> <span class="Comment">// second lowest byte of EBX</span> -<span id="L17" class="LineNr"> 17 </span> <span class="Normal">default</span>: raise << <span class="Constant">"invalid 8-bit register "</span> << r << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> +<span id="L17" class="LineNr"> 17 </span> <span class="Normal">default</span>: <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"invalid 8-bit register "</span> << r << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L18" class="LineNr"> 18 </span> <span class="Delimiter">}</span> <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">}</span> <span id="L20" class="LineNr"> 20 </span> -<span id="L21" class="LineNr"> 21 </span><span class="Normal">uint8_t</span>* effective_byte_address<span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L21" class="LineNr"> 21 </span><span class="Normal">uint8_t</span>* <a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> modrm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L22" class="LineNr"> 22 </span> <span class="Normal">uint8_t</span> mod = <span class="Delimiter">(</span>modrm>><span class="Constant">6</span><span class="Delimiter">);</span> <span id="L23" class="LineNr"> 23 </span> <span class="Normal">uint8_t</span> rm = modrm & <span class="Constant">0x7</span><span class="Delimiter">;</span> <span id="L24" class="LineNr"> 24 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L25" class="LineNr"> 25 </span> <span class="Comment">// select an 8-bit register</span> -<span id="L26" class="LineNr"> 26 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"r/m8 is "</span> << rname_8bit<span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> -<span id="L27" class="LineNr"> 27 </span> <span class="Identifier">return</span> reg_8bit<span class="Delimiter">(</span>rm<span class="Delimiter">);</span> +<span id="L26" class="LineNr"> 26 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"r/m8 is "</span> << <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L27" class="LineNr"> 27 </span> <span class="Identifier">return</span> <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rm<span class="Delimiter">);</span> <span id="L28" class="LineNr"> 28 </span> <span class="Delimiter">}</span> <span id="L29" class="LineNr"> 29 </span> <span class="Comment">// the rest is as usual</span> -<span id="L30" class="LineNr"> 30 </span> <span class="Identifier">return</span> mem_addr_u8<span class="Delimiter">(</span>effective_address_number<span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> +<span id="L30" class="LineNr"> 30 </span> <span class="Identifier">return</span> <a href='010---vm.cc.html#L208'>mem_addr_u8</a><span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L43'>effective_address_number</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">}</span> <span id="L32" class="LineNr"> 32 </span> -<span id="L33" class="LineNr"> 33 </span><span class="Normal">uint8_t</span>* reg_8bit<span class="Delimiter">(</span><span class="Normal">uint8_t</span> rm<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L33" class="LineNr"> 33 </span><span class="Normal">uint8_t</span>* <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> rm<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L34" class="LineNr"> 34 </span> <span class="Normal">uint8_t</span>* result = <span class="Normal">reinterpret_cast</span><<span class="Normal">uint8_t</span>*><span class="Delimiter">(</span>&Reg[rm & <span class="Constant">0x3</span>]<span class="Delimiter">.</span>i<span class="Delimiter">);</span> <span class="Comment">// _L register</span> <span id="L35" class="LineNr"> 35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>rm & <span class="Constant">0x4</span><span class="Delimiter">)</span> <span id="L36" class="LineNr"> 36 </span> ++result<span class="Delimiter">;</span> <span class="Comment">// _H register; assumes host is little-endian</span> @@ -99,7 +99,7 @@ if ('onhashchange' in window) { <span id="L38" class="LineNr"> 38 </span><span class="Delimiter">}</span> <span id="L39" class="LineNr"> 39 </span> <span id="L40" class="LineNr"> 40 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L41" class="LineNr"> 41 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"88"</span><span class="Delimiter">,</span> <span class="Constant">"copy r8 to r8/m8-at-r32"</span><span class="Delimiter">);</span> +<span id="L41" class="LineNr"> 41 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"88"</span><span class="Delimiter">,</span> <span class="Constant">"copy r8 to r8/m8-at-r32"</span><span class="Delimiter">);</span> <span id="L42" class="LineNr"> 42 </span> <span id="L43" class="LineNr"> 43 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span> <span id="L44" class="LineNr"> 44 </span><span class="Special">% Reg[EBX].i = 0x224488ab;</span> @@ -117,21 +117,21 @@ if ('onhashchange' in window) { <span id="L56" class="LineNr"> 56 </span> <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L58" class="LineNr"> 58 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span> <span class="Comment">// copy r8 to r/m8</span> -<span id="L59" class="LineNr"> 59 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L59" class="LineNr"> 59 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L60" class="LineNr"> 60 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rsrc = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L61" class="LineNr"> 61 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy "</span> << rname_8bit<span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> << <span class="Constant">" to r8/m8-at-r32"</span> << end<span class="Delimiter">();</span> +<span id="L61" class="LineNr"> 61 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy "</span> << <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">)</span> << <span class="Constant">" to r8/m8-at-r32"</span> << end<span class="Delimiter">();</span> <span id="L62" class="LineNr"> 62 </span> <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span> -<span id="L63" class="LineNr"> 63 </span> <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span><<span class="Normal">uint8_t</span>*><span class="Delimiter">(</span>effective_byte_address<span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> -<span id="L64" class="LineNr"> 64 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = reg_8bit<span class="Delimiter">(</span>rsrc<span class="Delimiter">);</span> +<span id="L63" class="LineNr"> 63 </span> <span class="Normal">uint8_t</span>* dest = <span class="Normal">reinterpret_cast</span><<span class="Normal">uint8_t</span>*><span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> +<span id="L64" class="LineNr"> 64 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rsrc<span class="Delimiter">);</span> <span id="L65" class="LineNr"> 65 </span> *dest = *src<span class="Delimiter">;</span> -<span id="L66" class="LineNr"> 66 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXBYTE << NUM<span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L66" class="LineNr"> 66 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>*dest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L67" class="LineNr"> 67 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span> <span id="L69" class="LineNr"> 69 </span> <span id="L70" class="LineNr"> 70 </span><span class="Comment">//:</span> <span id="L71" class="LineNr"> 71 </span> <span id="L72" class="LineNr"> 72 </span><span class="Delimiter">:(before "End Initialize Op Names")</span> -<span id="L73" class="LineNr"> 73 </span>put_new<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> <span class="Constant">"8a"</span><span class="Delimiter">,</span> <span class="Constant">"copy r8/m8-at-r32 to r8"</span><span class="Delimiter">);</span> +<span id="L73" class="LineNr"> 73 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> <span class="Constant">"8a"</span><span class="Delimiter">,</span> <span class="Constant">"copy r8/m8-at-r32 to r8"</span><span class="Delimiter">);</span> <span id="L74" class="LineNr"> 74 </span> <span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span> <span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[EBX].i = 0xaabbcc0f; // one nibble each of lowest byte set to all 0s and all 1s, to maximize value of this test</span> @@ -146,20 +146,20 @@ if ('onhashchange' in window) { <span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: effective address is 0x00002000 (EAX)</span> <span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: storing 0xab</span> <span id="L87" class="LineNr"> 87 </span><span class="Comment"># remaining bytes of EBX are *not* cleared</span> -<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: EBX now contains 0xaabbccab</span> +<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L16'>EBX</a> now contains 0xaabbccab</span> <span id="L89" class="LineNr"> 89 </span> <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">:(before "End Single-Byte Opcodes")</span> <span id="L91" class="LineNr"> 91 </span><span class="Normal">case</span> <span class="Constant">0x8a</span>: <span class="Delimiter">{</span> <span class="Comment">// copy r/m8 to r8</span> -<span id="L92" class="LineNr"> 92 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = next<span class="Delimiter">();</span> +<span id="L92" class="LineNr"> 92 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L355'>next</a><span class="Delimiter">();</span> <span id="L93" class="LineNr"> 93 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = <span class="Delimiter">(</span>modrm>><span class="Constant">3</span><span class="Delimiter">)</span>&<span class="Constant">0x7</span><span class="Delimiter">;</span> -<span id="L94" class="LineNr"> 94 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy r8/m8-at-r32 to "</span> << rname_8bit<span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L94" class="LineNr"> 94 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"copy r8/m8-at-r32 to "</span> << <a href='021byte_addressing.cc.html#L7'>rname_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L95" class="LineNr"> 95 </span> <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span> -<span id="L96" class="LineNr"> 96 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <span class="Normal">reinterpret_cast</span><<span class="Normal">uint8_t</span>*><span class="Delimiter">(</span>effective_byte_address<span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> -<span id="L97" class="LineNr"> 97 </span> <span class="Normal">uint8_t</span>* dest = reg_8bit<span class="Delimiter">(</span>rdest<span class="Delimiter">);</span> -<span id="L98" class="LineNr"> 98 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << HEXBYTE << NUM<span class="Delimiter">(</span>*src<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L96" class="LineNr"> 96 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span>* src = <span class="Normal">reinterpret_cast</span><<span class="Normal">uint8_t</span>*><span class="Delimiter">(</span><a href='021byte_addressing.cc.html#L21'>effective_byte_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span> +<span id="L97" class="LineNr"> 97 </span> <span class="Normal">uint8_t</span>* dest = <a href='021byte_addressing.cc.html#L33'>reg_8bit</a><span class="Delimiter">(</span>rdest<span class="Delimiter">);</span> +<span id="L98" class="LineNr"> 98 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0x"</span> << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>*src<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L99" class="LineNr"> 99 </span> *dest = *src<span class="Delimiter">;</span> <span id="L100" class="LineNr">100 </span> <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest_32bit = rdest & <span class="Constant">0x3</span><span class="Delimiter">;</span> -<span id="L101" class="LineNr">101 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << rname<span class="Delimiter">(</span>rdest_32bit<span class="Delimiter">)</span> << <span class="Constant">" now contains 0x"</span> << HEXWORD << Reg[rdest_32bit]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> +<span id="L101" class="LineNr">101 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest_32bit<span class="Delimiter">)</span> << <span class="Constant">" now contains 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << Reg[rdest_32bit]<span class="Delimiter">.</span>u << end<span class="Delimiter">();</span> <span id="L102" class="LineNr">102 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L103" class="LineNr">103 </span><span class="Delimiter">}</span> <span id="L104" class="LineNr">104 </span> diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html index ce01c630..2745d059 100644 --- a/html/subx/028translate.cc.html +++ b/html/subx/028translate.cc.html @@ -77,17 +77,17 @@ if ('onhashchange' in window) { <span id="L17" class="LineNr"> 17 </span><span class="Comment">//: Higher levels usually transform code on the basis of metadata.</span> <span id="L18" class="LineNr"> 18 </span> <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before "End Main")</span> -<span id="L20" class="LineNr"> 20 </span><span class="Normal">if</span> <span class="Delimiter">(</span>is_equal<span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"translate"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L21" class="LineNr"> 21 </span> START_TRACING_UNTIL_END_OF_SCOPE<span class="Delimiter">;</span> -<span id="L22" class="LineNr"> 22 </span> reset<span class="Delimiter">();</span> +<span id="L20" class="LineNr"> 20 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[<span class="Constant">1</span>]<span class="Delimiter">,</span> <span class="Constant">"translate"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L21" class="LineNr"> 21 </span> <a href='003trace.cc.html#L252'>START_TRACING_UNTIL_END_OF_SCOPE</a><span class="Delimiter">;</span> +<span id="L22" class="LineNr"> 22 </span> <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span> <span id="L23" class="LineNr"> 23 </span> <span class="Comment">// Begin subx translate</span> -<span id="L24" class="LineNr"> 24 </span> program p<span class="Delimiter">;</span> +<span id="L24" class="LineNr"> 24 </span> <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span> <span id="L25" class="LineNr"> 25 </span> string output_filename<span class="Delimiter">;</span> <span id="L26" class="LineNr"> 26 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip 'subx translate'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span> i < argc<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_equal<span class="Delimiter">(</span>argv[i]<span class="Delimiter">,</span> <span class="Constant">"-o"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>argv[i]<span class="Delimiter">,</span> <span class="Constant">"-o"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L28" class="LineNr"> 28 </span> ++i<span class="Delimiter">;</span> <span id="L29" class="LineNr"> 29 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i >= argc<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L30" class="LineNr"> 30 </span> print_translate_usage<span class="Delimiter">();</span> +<span id="L30" class="LineNr"> 30 </span> <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span> <span id="L31" class="LineNr"> 31 </span> cerr << <span class="Constant">"'-o' must be followed by a filename to write results to</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L32" class="LineNr"> 32 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L33" class="LineNr"> 33 </span> <span class="Delimiter">}</span> @@ -100,23 +100,23 @@ if ('onhashchange' in window) { <span id="L40" class="LineNr"> 40 </span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L41" class="LineNr"> 41 </span> <span class="Delimiter">}</span> <span id="L42" class="LineNr"> 42 </span> parse<span class="Delimiter">(</span>fin<span class="Delimiter">,</span> p<span class="Delimiter">);</span> -<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L44" class="LineNr"> 44 </span> <span class="Delimiter">}</span> <span id="L45" class="LineNr"> 45 </span> <span class="Delimiter">}</span> -<span id="L46" class="LineNr"> 46 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L47" class="LineNr"> 47 </span> print_translate_usage<span class="Delimiter">();</span> +<span id="L46" class="LineNr"> 46 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L47" class="LineNr"> 47 </span> <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span> <span id="L48" class="LineNr"> 48 </span> cerr << <span class="Constant">"nothing to do; must provide at least one file to read</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L49" class="LineNr"> 49 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L50" class="LineNr"> 50 </span> <span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L52" class="LineNr"> 52 </span> print_translate_usage<span class="Delimiter">();</span> +<span id="L52" class="LineNr"> 52 </span> <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">();</span> <span id="L53" class="LineNr"> 53 </span> cerr << <span class="Constant">"must provide a filename to write to using '-o'</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L54" class="LineNr"> 54 </span> exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L55" class="LineNr"> 55 </span> <span class="Delimiter">}</span> -<span id="L56" class="LineNr"> 56 </span> transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span> -<span id="L57" class="LineNr"> 57 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> -<span id="L58" class="LineNr"> 58 </span> save_elf<span class="Delimiter">(</span>p<span class="Delimiter">,</span> output_filename<span class="Delimiter">);</span> -<span id="L59" class="LineNr"> 59 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Delimiter">{</span> +<span id="L56" class="LineNr"> 56 </span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span> +<span id="L57" class="LineNr"> 57 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L58" class="LineNr"> 58 </span> <a href='028translate.cc.html#L73'>save_elf</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> output_filename<span class="Delimiter">);</span> +<span id="L59" class="LineNr"> 59 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L60" class="LineNr"> 60 </span> unlink<span class="Delimiter">(</span>output_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span> <span id="L61" class="LineNr"> 61 </span> <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L62" class="LineNr"> 62 </span> <span class="Delimiter">}</span> @@ -125,20 +125,20 @@ if ('onhashchange' in window) { <span id="L65" class="LineNr"> 65 </span><span class="Delimiter">}</span> <span id="L66" class="LineNr"> 66 </span> <span id="L67" class="LineNr"> 67 </span><span class="Delimiter">:(code)</span> -<span id="L68" class="LineNr"> 68 </span><span class="Normal">void</span> print_translate_usage<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L68" class="LineNr"> 68 </span><span class="Normal">void</span> <a href='028translate.cc.html#L68'>print_translate_usage</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L69" class="LineNr"> 69 </span> cerr << <span class="Constant">"Usage: subx translate file1 file2 ... -o output</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L70" class="LineNr"> 70 </span><span class="Delimiter">}</span> <span id="L71" class="LineNr"> 71 </span> <span id="L72" class="LineNr"> 72 </span><span class="Comment">// write out a program to a bare-bones ELF file</span> -<span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> save_elf<span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">,</span> <span class="Normal">const</span> string& filename<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> <a href='028translate.cc.html#L73'>save_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">,</span> <span class="Normal">const</span> string& filename<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L74" class="LineNr"> 74 </span> ofstream out<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> ios::binary<span class="Delimiter">);</span> -<span id="L75" class="LineNr"> 75 </span> write_elf_header<span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span> -<span id="L76" class="LineNr"> 76 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>size<span class="Delimiter">();</span> ++i<span class="Delimiter">)</span> -<span id="L77" class="LineNr"> 77 </span> write_segment<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span> +<span id="L75" class="LineNr"> 75 </span> <a href='028translate.cc.html#L81'>write_elf_header</a><span class="Delimiter">(</span>out<span class="Delimiter">,</span> p<span class="Delimiter">);</span> +<span id="L76" class="LineNr"> 76 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span> ++i<span class="Delimiter">)</span> +<span id="L77" class="LineNr"> 77 </span> <a href='028translate.cc.html#L175'>write_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> out<span class="Delimiter">);</span> <span id="L78" class="LineNr"> 78 </span> out<span class="Delimiter">.</span>close<span class="Delimiter">();</span> <span id="L79" class="LineNr"> 79 </span><span class="Delimiter">}</span> <span id="L80" class="LineNr"> 80 </span> -<span id="L81" class="LineNr"> 81 </span><span class="Normal">void</span> write_elf_header<span class="Delimiter">(</span>ostream& out<span class="Delimiter">,</span> <span class="Normal">const</span> program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L81" class="LineNr"> 81 </span><span class="Normal">void</span> <a href='028translate.cc.html#L81'>write_elf_header</a><span class="Delimiter">(</span>ostream& out<span class="Delimiter">,</span> <span class="Normal">const</span> program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L82" class="LineNr"> 82 </span> <span class="Normal">char</span> c = <span class="cSpecial">'\0'</span><span class="Delimiter">;</span> <span id="L83" class="LineNr"> 83 </span><span class="Comment">#define O(X) c = (X); out.write(&c, sizeof(c))</span> <span id="L84" class="LineNr"> 84 </span><span class="Comment">// host is required to be little-endian</span> @@ -157,7 +157,7 @@ if ('onhashchange' in window) { <span id="L97" class="LineNr"> 97 </span> <span class="Comment">// e_version</span> <span id="L98" class="LineNr"> 98 </span> O<span class="Delimiter">(</span><span class="Constant">0x01</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> O<span class="Delimiter">(</span><span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L99" class="LineNr"> 99 </span> <span class="Comment">// e_entry</span> -<span id="L100" class="LineNr">100 </span> <span class="Normal">int</span> e_entry = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span> <span class="Comment">// convention</span> +<span id="L100" class="LineNr">100 </span> <span class="Normal">int</span> e_entry = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>start<span class="Delimiter">;</span> <span class="Comment">// convention</span> <span id="L101" class="LineNr">101 </span> emit<span class="Delimiter">(</span>e_entry<span class="Delimiter">);</span> <span id="L102" class="LineNr">102 </span> <span class="Comment">// e_phoff -- immediately after ELF header</span> <span id="L103" class="LineNr">103 </span> <span class="Normal">int</span> e_phoff = <span class="Constant">0x34</span><span class="Delimiter">;</span> @@ -174,7 +174,7 @@ if ('onhashchange' in window) { <span id="L114" class="LineNr">114 </span> <span class="Normal">uint16_t</span> e_phentsize = <span class="Constant">0x20</span><span class="Delimiter">;</span> <span id="L115" class="LineNr">115 </span> emit<span class="Delimiter">(</span>e_phentsize<span class="Delimiter">);</span> <span id="L116" class="LineNr">116 </span> <span class="Comment">// e_phnum</span> -<span id="L117" class="LineNr">117 </span> <span class="Normal">uint16_t</span> e_phnum = SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">);</span> +<span id="L117" class="LineNr">117 </span> <span class="Normal">uint16_t</span> e_phnum = <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span> <span id="L118" class="LineNr">118 </span> emit<span class="Delimiter">(</span>e_phnum<span class="Delimiter">);</span> <span id="L119" class="LineNr">119 </span> <span class="Comment">// e_shentsize</span> <span id="L120" class="LineNr">120 </span> <span class="Normal">uint16_t</span> dummy16 = <span class="Constant">0x0</span><span class="Delimiter">;</span> @@ -184,8 +184,8 @@ if ('onhashchange' in window) { <span id="L124" class="LineNr">124 </span> <span class="Comment">// e_shstrndx</span> <span id="L125" class="LineNr">125 </span> emit<span class="Delimiter">(</span>dummy16<span class="Delimiter">);</span> <span id="L126" class="LineNr">126 </span> -<span id="L127" class="LineNr">127 </span> <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span> -<span id="L128" class="LineNr">128 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L127" class="LineNr">127 </span> <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span> +<span id="L128" class="LineNr">128 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L129" class="LineNr">129 </span> <span class="SalientComment">//// phdr</span> <span id="L130" class="LineNr">130 </span> <span class="Comment">// p_type</span> <span id="L131" class="LineNr">131 </span> <span class="Normal">uint32_t</span> p_type = <span class="Constant">0x1</span><span class="Delimiter">;</span> @@ -193,13 +193,13 @@ if ('onhashchange' in window) { <span id="L133" class="LineNr">133 </span> <span class="Comment">// p_offset</span> <span id="L134" class="LineNr">134 </span> emit<span class="Delimiter">(</span>p_offset<span class="Delimiter">);</span> <span id="L135" class="LineNr">135 </span> <span class="Comment">// p_vaddr</span> -<span id="L136" class="LineNr">136 </span> <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start<span class="Delimiter">;</span> +<span id="L136" class="LineNr">136 </span> <span class="Normal">uint32_t</span> p_start = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>start<span class="Delimiter">;</span> <span id="L137" class="LineNr">137 </span> emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span> <span id="L138" class="LineNr">138 </span> <span class="Comment">// p_paddr</span> <span id="L139" class="LineNr">139 </span> emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span> <span id="L140" class="LineNr">140 </span> <span class="Comment">// p_filesz</span> -<span id="L141" class="LineNr">141 </span> <span class="Normal">uint32_t</span> size = num_words<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> -<span id="L142" class="LineNr">142 </span> assert<span class="Delimiter">(</span>p_offset + size < INITIAL_SEGMENT_SIZE<span class="Delimiter">);</span> +<span id="L141" class="LineNr">141 </span> <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L185'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L142" class="LineNr">142 </span> assert<span class="Delimiter">(</span>p_offset + size < <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">);</span> <span id="L143" class="LineNr">143 </span> emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span> <span id="L144" class="LineNr">144 </span> <span class="Comment">// p_memsz</span> <span id="L145" class="LineNr">145 </span> emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span> @@ -221,7 +221,7 @@ if ('onhashchange' in window) { <span id="L161" class="LineNr">161 </span> <span class="Normal">uint32_t</span> p_align = <span class="Constant">0x1000</span><span class="Delimiter">;</span> <span class="Comment">// default page size on linux</span> <span id="L162" class="LineNr">162 </span> emit<span class="Delimiter">(</span>p_align<span class="Delimiter">);</span> <span id="L163" class="LineNr">163 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset % p_align != p_start % p_align<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L164" class="LineNr">164 </span> raise << <span class="Constant">"segment starting at 0x"</span> << HEXWORD << p_start << <span class="Constant">" is improperly aligned; alignment for p_offset "</span> << p_offset << <span class="Constant">" should be "</span> << <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> << <span class="Constant">" but is "</span> << <span class="Delimiter">(</span>p_start % p_align<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L164" class="LineNr">164 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"segment starting at 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << p_start << <span class="Constant">" is improperly aligned; alignment for p_offset "</span> << p_offset << <span class="Constant">" should be "</span> << <span class="Delimiter">(</span>p_offset % p_align<span class="Delimiter">)</span> << <span class="Constant">" but is "</span> << <span class="Delimiter">(</span>p_start % p_align<span class="Delimiter">)</span> << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L165" class="LineNr">165 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L166" class="LineNr">166 </span> <span class="Delimiter">}</span> <span id="L167" class="LineNr">167 </span> @@ -232,20 +232,20 @@ if ('onhashchange' in window) { <span id="L172" class="LineNr">172 </span><span class="Comment">#undef emit</span> <span id="L173" class="LineNr">173 </span><span class="Delimiter">}</span> <span id="L174" class="LineNr">174 </span> -<span id="L175" class="LineNr">175 </span><span class="Normal">void</span> write_segment<span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L176" class="LineNr">176 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L177" class="LineNr">177 </span> <span class="Normal">const</span> vector<word>& w = s<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>words<span class="Delimiter">;</span> -<span id="L178" class="LineNr">178 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>w<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L179" class="LineNr">179 </span> <span class="Normal">uint8_t</span> x = hex_byte<span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>data<span class="Delimiter">);</span> <span class="Comment">// we're done with metadata by this point</span> +<span id="L175" class="LineNr">175 </span><span class="Normal">void</span> <a href='028translate.cc.html#L175'>write_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">,</span> ostream& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L176" class="LineNr">176 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L177" class="LineNr">177 </span> <span class="Normal">const</span> vector<word>& w = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">;</span> +<span id="L178" class="LineNr">178 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L179" class="LineNr">179 </span> <span class="Normal">uint8_t</span> x = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">).</span>data<span class="Delimiter">);</span> <span class="Comment">// we're done with metadata by this point</span> <span id="L180" class="LineNr">180 </span> out<span class="Delimiter">.</span>write<span class="Delimiter">(</span><span class="Normal">reinterpret_cast</span><<span class="Normal">const</span> <span class="Normal">char</span>*><span class="Delimiter">(</span>&x<span class="Delimiter">),</span> <span class="Comment">/*</span><span class="Comment">sizeof(byte)</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span> <span id="L181" class="LineNr">181 </span> <span class="Delimiter">}</span> <span id="L182" class="LineNr">182 </span> <span class="Delimiter">}</span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span> <span id="L184" class="LineNr">184 </span> -<span id="L185" class="LineNr">185 </span><span class="Normal">uint32_t</span> num_words<span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L185" class="LineNr">185 </span><span class="Normal">uint32_t</span> <a href='028translate.cc.html#L185'>num_words</a><span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L186" class="LineNr">186 </span> <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L187" class="LineNr">187 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L188" class="LineNr">188 </span> sum += SIZE<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>words<span class="Delimiter">);</span> +<span id="L187" class="LineNr">187 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L188" class="LineNr">188 </span> sum += <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> <span id="L189" class="LineNr">189 </span> <span class="Identifier">return</span> sum<span class="Delimiter">;</span> <span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span> <span id="L191" class="LineNr">191 </span> diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html index 38b813c0..7d9e6635 100644 --- a/html/subx/030---operands.cc.html +++ b/html/subx/030---operands.cc.html @@ -74,19 +74,19 @@ if ('onhashchange' in window) { <span id="L12" class="LineNr"> 12 </span><span class="Comment">//: byte, and others may consist of multiple bytes. This layer will correctly</span> <span id="L13" class="LineNr"> 13 </span><span class="Comment">//: pack and order the bytes corresponding to the operands in an instruction.</span> <span id="L14" class="LineNr"> 14 </span> -<span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before "End Help Texts")</span> -<span id="L16" class="LineNr"> 16 </span>put_new<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"instructions"</span><span class="Delimiter">,</span> +<span id="L15" class="LineNr"> 15 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Texts")</span> +<span id="L16" class="LineNr"> 16 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"instructions"</span><span class="Delimiter">,</span> <span id="L17" class="LineNr"> 17 </span> <span class="Constant">"Each x86 instruction consists of an instruction or opcode and some number</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L18" class="LineNr"> 18 </span> <span class="Constant">"of operands.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L19" class="LineNr"> 19 </span> <span class="Constant">"Each operand has a type. An instruction won't have more than one operand of</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L20" class="LineNr"> 20 </span> <span class="Constant">"any type.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L21" class="LineNr"> 21 </span> <span class="Constant">"Each instruction has some set of allowed operand types. It'll reject others.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L22" class="LineNr"> 22 </span> <span class="Constant">"The complete list of operand <a href='031check_operands.cc.html#L431'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L23" class="LineNr"> 23 </span> <span class="Constant">"(register or memory), scale, index, base, disp8, disp16, <a href='subx.cc.html#L8324'>disp32</a>, imm8,</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L23" class="LineNr"> 23 </span> <span class="Constant">"(register or memory), scale, index, base, disp8, disp16, disp32, imm8,</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L24" class="LineNr"> 24 </span> <span class="Constant">"imm32.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L25" class="LineNr"> 25 </span> <span class="Constant">"Each of these has its own help page. Try reading 'subx help mod' next.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">);</span> -<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before "End Help Contents")</span> +<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Contents")</span> <span id="L28" class="LineNr"> 28 </span>cerr << <span class="Constant">" instructions</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> <span id="L29" class="LineNr"> 29 </span> <span id="L30" class="LineNr"> 30 </span><span class="Delimiter">:(scenario pack_immediate_constants)</span> @@ -94,38 +94,38 @@ if ('onhashchange' in window) { <span id="L32" class="LineNr"> 32 </span>bb <span class="Constant">0x2a</span>/imm32 <span id="L33" class="LineNr"> 33 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span> <span id="L34" class="LineNr"> 34 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span> -<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: copy imm32 0x0000002a to EBX</span> +<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span> <span id="L36" class="LineNr"> 36 </span> <span id="L37" class="LineNr"> 37 </span><span class="Comment">//: complete set of valid operand types</span> <span id="L38" class="LineNr"> 38 </span> <span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L40" class="LineNr"> 40 </span>set<string> Instruction_operands<span class="Delimiter">;</span> +<span id="L40" class="LineNr"> 40 </span>set<string> <a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">;</span> <span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L42" class="LineNr"> 42 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"subop"</span><span class="Delimiter">);</span> -<span id="L43" class="LineNr"> 43 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"mod"</span><span class="Delimiter">);</span> -<span id="L44" class="LineNr"> 44 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"rm32"</span><span class="Delimiter">);</span> -<span id="L45" class="LineNr"> 45 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"base"</span><span class="Delimiter">);</span> -<span id="L46" class="LineNr"> 46 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"index"</span><span class="Delimiter">);</span> -<span id="L47" class="LineNr"> 47 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"scale"</span><span class="Delimiter">);</span> -<span id="L48" class="LineNr"> 48 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"r32"</span><span class="Delimiter">);</span> -<span id="L49" class="LineNr"> 49 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"disp8"</span><span class="Delimiter">);</span> -<span id="L50" class="LineNr"> 50 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"disp16"</span><span class="Delimiter">);</span> -<span id="L51" class="LineNr"> 51 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"disp32"</span><span class="Delimiter">);</span> -<span id="L52" class="LineNr"> 52 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"imm8"</span><span class="Delimiter">);</span> -<span id="L53" class="LineNr"> 53 </span>Instruction_operands<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"imm32"</span><span class="Delimiter">);</span> +<span id="L42" class="LineNr"> 42 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"subop"</span><span class="Delimiter">);</span> +<span id="L43" class="LineNr"> 43 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"mod"</span><span class="Delimiter">);</span> +<span id="L44" class="LineNr"> 44 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"rm32"</span><span class="Delimiter">);</span> +<span id="L45" class="LineNr"> 45 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"base"</span><span class="Delimiter">);</span> +<span id="L46" class="LineNr"> 46 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"index"</span><span class="Delimiter">);</span> +<span id="L47" class="LineNr"> 47 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"scale"</span><span class="Delimiter">);</span> +<span id="L48" class="LineNr"> 48 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"r32"</span><span class="Delimiter">);</span> +<span id="L49" class="LineNr"> 49 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"disp8"</span><span class="Delimiter">);</span> +<span id="L50" class="LineNr"> 50 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"disp16"</span><span class="Delimiter">);</span> +<span id="L51" class="LineNr"> 51 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"disp32"</span><span class="Delimiter">);</span> +<span id="L52" class="LineNr"> 52 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"imm8"</span><span class="Delimiter">);</span> +<span id="L53" class="LineNr"> 53 </span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Constant">"imm32"</span><span class="Delimiter">);</span> <span id="L54" class="LineNr"> 54 </span> -<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(before "End Help Texts")</span> -<span id="L56" class="LineNr"> 56 </span>init_operand_type_help<span class="Delimiter">();</span> +<span id="L55" class="LineNr"> 55 </span><span class="Delimiter">:(before "End <a href='001help.cc.html#L53'>Help</a> Texts")</span> +<span id="L56" class="LineNr"> 56 </span><a href='030---operands.cc.html#L58'>init_operand_type_help</a><span class="Delimiter">();</span> <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(code)</span> -<span id="L58" class="LineNr"> 58 </span><span class="Normal">void</span> init_operand_type_help<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L59" class="LineNr"> 59 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">,</span> +<span id="L58" class="LineNr"> 58 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L58'>init_operand_type_help</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L59" class="LineNr"> 59 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">,</span> <span id="L60" class="LineNr"> 60 </span> <span class="Constant">"2-bit operand controlling the _addressing mode_ of many instructions,</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L61" class="LineNr"> 61 </span> <span class="Constant">"to determine how to compute the _effective address_ to look up memory at</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L62" class="LineNr"> 62 </span> <span class="Constant">"based on the 'rm32' operand and potentially others.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L63" class="LineNr"> 63 </span> <span class="Constant">"</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L64" class="LineNr"> 64 </span> <span class="Constant">"If mod = 3, just operate on the contents of the register specified by rm32</span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L64" class="LineNr"> 64 </span> <span class="Constant">"If mod = 3, just operate on the <a href='003trace.cc.html#L74'>contents</a> of the register specified by rm32</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L65" class="LineNr"> 65 </span> <span class="Constant">" (direct mode).</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L66" class="LineNr"> 66 </span> <span class="Constant">"If mod = 2, effective address is usually* rm32 + <a href='subx.cc.html#L8324'>disp32</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> +<span id="L66" class="LineNr"> 66 </span> <span class="Constant">"If mod = 2, effective address is usually* rm32 + disp32</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L67" class="LineNr"> 67 </span> <span class="Constant">" (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L68" class="LineNr"> 68 </span> <span class="Constant">"If mod = 1, effective address is usually* rm32 + disp8</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L69" class="LineNr"> 69 </span> <span class="Constant">" (indirect mode with displacement).</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -139,14 +139,14 @@ if ('onhashchange' in window) { <span id="L77" class="LineNr"> 77 </span> <span class="Constant">" - modrm.pdf: volume 2, table 2-2, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the ModR/M byte.</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L78" class="LineNr"> 78 </span> <span class="Constant">" - sib.pdf: volume 2, table 2-3, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the SIB byte.</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L79" class="LineNr"> 79 </span> <span class="Delimiter">);</span> -<span id="L80" class="LineNr"> 80 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">,</span> +<span id="L80" class="LineNr"> 80 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">,</span> <span id="L81" class="LineNr"> 81 </span> <span class="Constant">"Additional 3-bit operand for determining the instruction when the opcode is 81, 8f or ff.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L82" class="LineNr"> 82 </span> <span class="Constant">"Can't coexist with operand of type 'r32' in a single instruction, because the two use the same bits.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L83" class="LineNr"> 83 </span> <span class="Delimiter">);</span> -<span id="L84" class="LineNr"> 84 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">,</span> +<span id="L84" class="LineNr"> 84 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">,</span> <span id="L85" class="LineNr"> 85 </span> <span class="Constant">"3-bit operand specifying a register operand used directly, without any further addressing modes.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L86" class="LineNr"> 86 </span> <span class="Delimiter">);</span> -<span id="L87" class="LineNr"> 87 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">,</span> +<span id="L87" class="LineNr"> 87 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">,</span> <span id="L88" class="LineNr"> 88 </span> <span class="Constant">"32-bit value in register or memory. The precise details of its construction</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L89" class="LineNr"> 89 </span> <span class="Constant">"depend on the eponymous 3-bit 'rm32' operand, the 'mod' operand, and also</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L90" class="LineNr"> 90 </span> <span class="Constant">"potentially the 'SIB' operands ('scale', 'index' and 'base') and a displacement</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -157,7 +157,7 @@ if ('onhashchange' in window) { <span id="L95" class="LineNr"> 95 </span> <span class="Constant">" - modrm.pdf: volume 2, table 2-2, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the ModR/M byte.</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L96" class="LineNr"> 96 </span> <span class="Constant">" - sib.pdf: volume 2, table 2-3, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the SIB byte.</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L97" class="LineNr"> 97 </span> <span class="Delimiter">);</span> -<span id="L98" class="LineNr"> 98 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> +<span id="L98" class="LineNr"> 98 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> <span id="L99" class="LineNr"> 99 </span> <span class="Constant">"Additional 3-bit operand (when 'rm32' is 4, unless 'mod' is 3) specifying the</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L100" class="LineNr">100 </span> <span class="Constant">"register containing an address to look up.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L101" class="LineNr">101 </span> <span class="Constant">"This address may be further modified by 'index' and 'scale' operands.</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -166,7 +166,7 @@ if ('onhashchange' in window) { <span id="L104" class="LineNr">104 </span> <span class="Constant">"volume 2, table 2-3, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the SIB byte</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L105" class="LineNr">105 </span> <span class="Constant">"It is included in this repository as 'sib.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L106" class="LineNr">106 </span> <span class="Delimiter">);</span> -<span id="L107" class="LineNr">107 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> +<span id="L107" class="LineNr">107 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> <span id="L108" class="LineNr">108 </span> <span class="Constant">"Optional 3-bit operand (when 'rm32' is 4 unless 'mod' is 3) that can be added to</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L109" class="LineNr">109 </span> <span class="Constant">"the 'base' operand to compute the 'effective address' at which to look up memory.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L110" class="LineNr">110 </span> <span class="Constant">" effective address = base + index*scale + displacement (disp8 or disp32)</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -174,7 +174,7 @@ if ('onhashchange' in window) { <span id="L112" class="LineNr">112 </span> <span class="Constant">"volume 2, table 2-3, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the SIB byte</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L113" class="LineNr">113 </span> <span class="Constant">"It is included in this repository as 'sib.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L114" class="LineNr">114 </span> <span class="Delimiter">);</span> -<span id="L115" class="LineNr">115 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"scale"</span><span class="Delimiter">,</span> +<span id="L115" class="LineNr">115 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"scale"</span><span class="Delimiter">,</span> <span id="L116" class="LineNr">116 </span> <span class="Constant">"Optional 2-bit operand (when 'rm32' is 4 unless 'mod' is 3) that encodes a</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L117" class="LineNr">117 </span> <span class="Constant">"power of 2 to be multiplied to the 'index' operand before adding the result to</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L118" class="LineNr">118 </span> <span class="Constant">"the 'base' operand to compute the _effective address_ to operate on.</span><span class="cSpecial">\n</span><span class="Constant">"</span> @@ -189,19 +189,19 @@ if ('onhashchange' in window) { <span id="L127" class="LineNr">127 </span> <span class="Constant">"volume 2, table 2-3, </span><span class="cSpecial">\"</span><span class="Constant">32-bit addressing with the SIB byte</span><span class="cSpecial">\"</span><span class="Constant">.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L128" class="LineNr">128 </span> <span class="Constant">"It is included in this repository as 'sib.pdf'.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L129" class="LineNr">129 </span> <span class="Delimiter">);</span> -<span id="L130" class="LineNr">130 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"disp8"</span><span class="Delimiter">,</span> +<span id="L130" class="LineNr">130 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"disp8"</span><span class="Delimiter">,</span> <span id="L131" class="LineNr">131 </span> <span class="Constant">"8-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L132" class="LineNr">132 </span> <span class="Delimiter">);</span> -<span id="L133" class="LineNr">133 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"disp16"</span><span class="Delimiter">,</span> +<span id="L133" class="LineNr">133 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"disp16"</span><span class="Delimiter">,</span> <span id="L134" class="LineNr">134 </span> <span class="Constant">"16-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L135" class="LineNr">135 </span> <span class="Delimiter">);</span> -<span id="L136" class="LineNr">136 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"disp32"</span><span class="Delimiter">,</span> +<span id="L136" class="LineNr">136 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"disp32"</span><span class="Delimiter">,</span> <span id="L137" class="LineNr">137 </span> <span class="Constant">"32-bit value to be added in many instructions.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L138" class="LineNr">138 </span> <span class="Delimiter">);</span> -<span id="L139" class="LineNr">139 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"imm8"</span><span class="Delimiter">,</span> +<span id="L139" class="LineNr">139 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"imm8"</span><span class="Delimiter">,</span> <span id="L140" class="LineNr">140 </span> <span class="Constant">"8-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L141" class="LineNr">141 </span> <span class="Delimiter">);</span> -<span id="L142" class="LineNr">142 </span> put<span class="Delimiter">(</span>Help<span class="Delimiter">,</span> <span class="Constant">"imm32"</span><span class="Delimiter">,</span> +<span id="L142" class="LineNr">142 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='001help.cc.html#L53'>Help</a><span class="Delimiter">,</span> <span class="Constant">"imm32"</span><span class="Delimiter">,</span> <span id="L143" class="LineNr">143 </span> <span class="Constant">"32-bit value for many instructions.</span><span class="cSpecial">\n</span><span class="Constant">"</span> <span id="L144" class="LineNr">144 </span> <span class="Delimiter">);</span> <span id="L145" class="LineNr">145 </span><span class="Delimiter">}</span> @@ -210,95 +210,95 @@ if ('onhashchange' in window) { <span id="L148" class="LineNr">148 </span> <span id="L149" class="LineNr">149 </span><span class="Delimiter">:(after "Begin Transforms")</span> <span id="L150" class="LineNr">150 </span><span class="Comment">// Begin Level-2 Transforms</span> -<span id="L151" class="LineNr">151 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span> +<span id="L151" class="LineNr">151 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pack_operands<span class="Delimiter">);</span> <span id="L152" class="LineNr">152 </span><span class="Comment">// End Level-2 Transforms</span> <span id="L153" class="LineNr">153 </span> <span id="L154" class="LineNr">154 </span><span class="Delimiter">:(code)</span> <span id="L155" class="LineNr">155 </span><span class="Normal">void</span> pack_operands<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L156" class="LineNr">156 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L157" class="LineNr">157 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L156" class="LineNr">156 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L157" class="LineNr">157 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> <span id="L158" class="LineNr">158 </span> <span class="Comment">// Pack Operands(segment code)</span> -<span id="L159" class="LineNr">159 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- pack operands"</span> << end<span class="Delimiter">();</span> -<span id="L160" class="LineNr">160 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L161" class="LineNr">161 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L162" class="LineNr">162 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L163" class="LineNr">163 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"packing instruction '"</span> << to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L159" class="LineNr">159 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- pack operands"</span> << end<span class="Delimiter">();</span> +<span id="L160" class="LineNr">160 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L161" class="LineNr">161 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L162" class="LineNr">162 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L163" class="LineNr">163 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"packing instruction '"</span> << to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">with metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L164" class="LineNr">164 </span> pack_operands<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> -<span id="L165" class="LineNr">165 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after packing: '"</span> << to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L165" class="LineNr">165 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after packing: '"</span> << to_string<span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">without metadata</span><span class="Comment">*/</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L166" class="LineNr">166 </span> <span class="Delimiter">}</span> <span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span> <span id="L168" class="LineNr">168 </span> <span id="L169" class="LineNr">169 </span><span class="Normal">void</span> pack_operands<span class="Delimiter">(</span>line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L170" class="LineNr">170 </span> line new_inst<span class="Delimiter">;</span> -<span id="L171" class="LineNr">171 </span> add_opcodes<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> -<span id="L172" class="LineNr">172 </span> add_modrm_byte<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> -<span id="L173" class="LineNr">173 </span> add_sib_byte<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> -<span id="L174" class="LineNr">174 </span> add_disp_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> -<span id="L175" class="LineNr">175 </span> add_imm_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> -<span id="L176" class="LineNr">176 </span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> +<span id="L170" class="LineNr">170 </span> <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span> +<span id="L171" class="LineNr">171 </span> <a href='030---operands.cc.html#L179'>add_opcodes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> +<span id="L172" class="LineNr">172 </span> <a href='030---operands.cc.html#L189'>add_modrm_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> +<span id="L173" class="LineNr">173 </span> <a href='030---operands.cc.html#L215'>add_sib_byte</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> +<span id="L174" class="LineNr">174 </span> <a href='030---operands.cc.html#L237'>add_disp_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> +<span id="L175" class="LineNr">175 </span> <a href='030---operands.cc.html#L249'>add_imm_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> new_inst<span class="Delimiter">);</span> +<span id="L176" class="LineNr">176 </span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> <span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span> <span id="L178" class="LineNr">178 </span> -<span id="L179" class="LineNr">179 </span><span class="Normal">void</span> add_opcodes<span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L180" class="LineNr">180 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> -<span id="L181" class="LineNr">181 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span> || in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f2"</span> || in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f3"</span><span class="Delimiter">)</span> -<span id="L182" class="LineNr">182 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span> -<span id="L183" class="LineNr">183 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f3"</span> && in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> -<span id="L184" class="LineNr">184 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span> -<span id="L185" class="LineNr">185 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f2"</span> && in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> -<span id="L186" class="LineNr">186 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span> +<span id="L179" class="LineNr">179 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L179'>add_opcodes</a><span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L180" class="LineNr">180 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> +<span id="L181" class="LineNr">181 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f2"</span> || in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f3"</span><span class="Delimiter">)</span> +<span id="L182" class="LineNr">182 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span> +<span id="L183" class="LineNr">183 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f3"</span> && in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> +<span id="L184" class="LineNr">184 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span> +<span id="L185" class="LineNr">185 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f2"</span> && in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> +<span id="L186" class="LineNr">186 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">));</span> <span id="L187" class="LineNr">187 </span><span class="Delimiter">}</span> <span id="L188" class="LineNr">188 </span> -<span id="L189" class="LineNr">189 </span><span class="Normal">void</span> add_modrm_byte<span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L189" class="LineNr">189 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L189'>add_modrm_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L190" class="LineNr">190 </span> <span class="Normal">uint8_t</span> mod=<span class="Constant">0</span><span class="Delimiter">,</span> reg_subop=<span class="Constant">0</span><span class="Delimiter">,</span> rm32=<span class="Constant">0</span><span class="Delimiter">;</span> <span id="L191" class="LineNr">191 </span> <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L192" class="LineNr">192 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L193" class="LineNr">193 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L192" class="LineNr">192 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L193" class="LineNr">193 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L194" class="LineNr">194 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L195" class="LineNr">195 </span> mod = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L195" class="LineNr">195 </span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L196" class="LineNr">196 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L197" class="LineNr">197 </span> <span class="Delimiter">}</span> <span id="L198" class="LineNr">198 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L199" class="LineNr">199 </span> rm32 = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L199" class="LineNr">199 </span> rm32 = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L200" class="LineNr">200 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L201" class="LineNr">201 </span> <span class="Delimiter">}</span> <span id="L202" class="LineNr">202 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L203" class="LineNr">203 </span> reg_subop = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L203" class="LineNr">203 </span> reg_subop = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L204" class="LineNr">204 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L205" class="LineNr">205 </span> <span class="Delimiter">}</span> <span id="L206" class="LineNr">206 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L207" class="LineNr">207 </span> reg_subop = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L207" class="LineNr">207 </span> reg_subop = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L208" class="LineNr">208 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L209" class="LineNr">209 </span> <span class="Delimiter">}</span> <span id="L210" class="LineNr">210 </span> <span class="Delimiter">}</span> <span id="L211" class="LineNr">211 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span> -<span id="L212" class="LineNr">212 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>hex_byte_text<span class="Delimiter">((</span>mod << <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>reg_subop << <span class="Constant">3</span><span class="Delimiter">)</span> | rm32<span class="Delimiter">));</span> +<span id="L212" class="LineNr">212 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L279'>hex_byte_text</a><span class="Delimiter">((</span>mod << <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>reg_subop << <span class="Constant">3</span><span class="Delimiter">)</span> | rm32<span class="Delimiter">));</span> <span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span> <span id="L214" class="LineNr">214 </span> -<span id="L215" class="LineNr">215 </span><span class="Normal">void</span> add_sib_byte<span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L215" class="LineNr">215 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L215'>add_sib_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L216" class="LineNr">216 </span> <span class="Normal">uint8_t</span> scale=<span class="Constant">0</span><span class="Delimiter">,</span> index=<span class="Constant">0</span><span class="Delimiter">,</span> base=<span class="Constant">0</span><span class="Delimiter">;</span> <span id="L217" class="LineNr">217 </span> <span class="Normal">bool</span> emit =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L218" class="LineNr">218 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L219" class="LineNr">219 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L218" class="LineNr">218 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L219" class="LineNr">219 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L220" class="LineNr">220 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"scale"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L221" class="LineNr">221 </span> scale = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L221" class="LineNr">221 </span> scale = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L222" class="LineNr">222 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L223" class="LineNr">223 </span> <span class="Delimiter">}</span> <span id="L224" class="LineNr">224 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L225" class="LineNr">225 </span> index = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L225" class="LineNr">225 </span> index = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L226" class="LineNr">226 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L227" class="LineNr">227 </span> <span class="Delimiter">}</span> <span id="L228" class="LineNr">228 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L229" class="LineNr">229 </span> base = hex_byte<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L229" class="LineNr">229 </span> base = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L230" class="LineNr">230 </span> emit =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L231" class="LineNr">231 </span> <span class="Delimiter">}</span> <span id="L232" class="LineNr">232 </span> <span class="Delimiter">}</span> <span id="L233" class="LineNr">233 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>emit<span class="Delimiter">)</span> -<span id="L234" class="LineNr">234 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>hex_byte_text<span class="Delimiter">((</span>scale << <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>index << <span class="Constant">3</span><span class="Delimiter">)</span> | base<span class="Delimiter">));</span> +<span id="L234" class="LineNr">234 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L279'>hex_byte_text</a><span class="Delimiter">((</span>scale << <span class="Constant">6</span><span class="Delimiter">)</span> | <span class="Delimiter">(</span>index << <span class="Constant">3</span><span class="Delimiter">)</span> | base<span class="Delimiter">));</span> <span id="L235" class="LineNr">235 </span><span class="Delimiter">}</span> <span id="L236" class="LineNr">236 </span> -<span id="L237" class="LineNr">237 </span><span class="Normal">void</span> add_disp_bytes<span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L238" class="LineNr">238 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L239" class="LineNr">239 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L237" class="LineNr">237 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L237'>add_disp_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L238" class="LineNr">238 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L239" class="LineNr">239 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L240" class="LineNr">240 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp8"</span><span class="Delimiter">))</span> <span id="L241" class="LineNr">241 </span> emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span> <span id="L242" class="LineNr">242 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp16"</span><span class="Delimiter">))</span> @@ -308,9 +308,9 @@ if ('onhashchange' in window) { <span id="L246" class="LineNr">246 </span> <span class="Delimiter">}</span> <span id="L247" class="LineNr">247 </span><span class="Delimiter">}</span> <span id="L248" class="LineNr">248 </span> -<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> add_imm_bytes<span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L250" class="LineNr">250 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L251" class="LineNr">251 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L249" class="LineNr">249 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L249'>add_imm_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">,</span> line& out<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L250" class="LineNr">250 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L251" class="LineNr">251 </span> <span class="Normal">const</span> word& curr = in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L252" class="LineNr">252 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"imm8"</span><span class="Delimiter">))</span> <span id="L253" class="LineNr">253 </span> emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> curr<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span> <span id="L254" class="LineNr">254 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"imm32"</span><span class="Delimiter">))</span> @@ -320,41 +320,41 @@ if ('onhashchange' in window) { <span id="L258" class="LineNr">258 </span> <span id="L259" class="LineNr">259 </span><span class="Normal">void</span> emit_hex_bytes<span class="Delimiter">(</span>line& out<span class="Delimiter">,</span> <span class="Normal">const</span> word& w<span class="Delimiter">,</span> <span class="Normal">int</span> num<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L260" class="LineNr">260 </span> assert<span class="Delimiter">(</span>num <= <span class="Constant">4</span><span class="Delimiter">);</span> -<span id="L261" class="LineNr">261 </span> <span class="Normal">bool</span> is_number = looks_like_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L261" class="LineNr">261 </span> <span class="Normal">bool</span> is_number = <a href='030---operands.cc.html#L439'>looks_like_hex_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L262" class="LineNr">262 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>num == <span class="Constant">1</span> || !is_number<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L263" class="LineNr">263 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span> <span class="Comment">// preserve existing metadata</span> +<span id="L263" class="LineNr">263 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>w<span class="Delimiter">);</span> <span class="Comment">// preserve existing metadata</span> <span id="L264" class="LineNr">264 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_number<span class="Delimiter">)</span> -<span id="L265" class="LineNr">265 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = hex_byte_to_string<span class="Delimiter">(</span>parse_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">));</span> +<span id="L265" class="LineNr">265 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span><a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">));</span> <span id="L266" class="LineNr">266 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L267" class="LineNr">267 </span> <span class="Delimiter">}</span> -<span id="L268" class="LineNr">268 </span> emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> <span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span>parse_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">)),</span> num<span class="Delimiter">);</span> +<span id="L268" class="LineNr">268 </span> emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> <span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span><a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">)),</span> num<span class="Delimiter">);</span> <span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span> <span id="L270" class="LineNr">270 </span> <span id="L271" class="LineNr">271 </span><span class="Normal">void</span> emit_hex_bytes<span class="Delimiter">(</span>line& out<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> val<span class="Delimiter">,</span> <span class="Normal">int</span> num<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L272" class="LineNr">272 </span> assert<span class="Delimiter">(</span>num <= <span class="Constant">4</span><span class="Delimiter">);</span> <span id="L273" class="LineNr">273 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < num<span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L274" class="LineNr">274 </span> out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>hex_byte_text<span class="Delimiter">(</span>val & <span class="Constant">0xff</span><span class="Delimiter">));</span> +<span id="L274" class="LineNr">274 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='030---operands.cc.html#L279'>hex_byte_text</a><span class="Delimiter">(</span>val & <span class="Constant">0xff</span><span class="Delimiter">));</span> <span id="L275" class="LineNr">275 </span> val = val >> <span class="Constant">8</span><span class="Delimiter">;</span> <span id="L276" class="LineNr">276 </span> <span class="Delimiter">}</span> <span id="L277" class="LineNr">277 </span><span class="Delimiter">}</span> <span id="L278" class="LineNr">278 </span> -<span id="L279" class="LineNr">279 </span>word hex_byte_text<span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L280" class="LineNr">280 </span> word result<span class="Delimiter">;</span> -<span id="L281" class="LineNr">281 </span> result<span class="Delimiter">.</span>data = hex_byte_to_string<span class="Delimiter">(</span>val<span class="Delimiter">);</span> +<span id="L279" class="LineNr">279 </span><a href='011run.cc.html#L123'>word</a> <a href='030---operands.cc.html#L279'>hex_byte_text</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L280" class="LineNr">280 </span> <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span> +<span id="L281" class="LineNr">281 </span> result<span class="Delimiter">.</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span> <span id="L282" class="LineNr">282 </span> result<span class="Delimiter">.</span>original = result<span class="Delimiter">.</span>data+<span class="Constant">"/auto"</span><span class="Delimiter">;</span> <span id="L283" class="LineNr">283 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span> <span id="L285" class="LineNr">285 </span> -<span id="L286" class="LineNr">286 </span>string hex_byte_to_string<span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L286" class="LineNr">286 </span>string <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L287" class="LineNr">287 </span> ostringstream out<span class="Delimiter">;</span> <span id="L288" class="LineNr">288 </span> <span class="Comment">// uint8_t prints without padding, but int8_t will expand to 32 bits again</span> -<span id="L289" class="LineNr">289 </span> out << HEXBYTE << NUM<span class="Delimiter">(</span>val<span class="Delimiter">);</span> +<span id="L289" class="LineNr">289 </span> out << <a href='010---vm.cc.html#L403'>HEXBYTE</a> << <a href='010---vm.cc.html#L406'>NUM</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span> <span id="L290" class="LineNr">290 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L291" class="LineNr">291 </span><span class="Delimiter">}</span> <span id="L292" class="LineNr">292 </span> <span id="L293" class="LineNr">293 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> vector<word>& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L294" class="LineNr">294 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L295" class="LineNr">295 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L295" class="LineNr">295 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L296" class="LineNr">296 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> <span id="L297" class="LineNr">297 </span> out << in<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span> <span id="L298" class="LineNr">298 </span> <span class="Delimiter">}</span> @@ -362,14 +362,14 @@ if ('onhashchange' in window) { <span id="L300" class="LineNr">300 </span><span class="Delimiter">}</span> <span id="L301" class="LineNr">301 </span> <span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before "End Unit Tests")</span> -<span id="L303" class="LineNr">303 </span><span class="Normal">void</span> test_preserve_metadata_when_emitting_single_byte<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L304" class="LineNr">304 </span> word in<span class="Delimiter">;</span> +<span id="L303" class="LineNr">303 </span><span class="Normal">void</span> <a href='030---operands.cc.html#L303'>test_preserve_metadata_when_emitting_single_byte</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L304" class="LineNr">304 </span> <a href='011run.cc.html#L123'>word</a> in<span class="Delimiter">;</span> <span id="L305" class="LineNr">305 </span> in<span class="Delimiter">.</span>data = <span class="Constant">"f0"</span><span class="Delimiter">;</span> <span id="L306" class="LineNr">306 </span> in<span class="Delimiter">.</span>original = <span class="Constant">"f0/foo"</span><span class="Delimiter">;</span> -<span id="L307" class="LineNr">307 </span> line out<span class="Delimiter">;</span> +<span id="L307" class="LineNr">307 </span> <a href='011run.cc.html#L117'>line</a> out<span class="Delimiter">;</span> <span id="L308" class="LineNr">308 </span> emit_hex_bytes<span class="Delimiter">(</span>out<span class="Delimiter">,</span> in<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L309" class="LineNr">309 </span> CHECK_EQ<span class="Delimiter">(</span>out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data<span class="Delimiter">,</span> <span class="Constant">"f0"</span><span class="Delimiter">);</span> -<span id="L310" class="LineNr">310 </span> CHECK_EQ<span class="Delimiter">(</span>out<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original<span class="Delimiter">,</span> <span class="Constant">"f0/foo"</span><span class="Delimiter">);</span> +<span id="L309" class="LineNr">309 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data<span class="Delimiter">,</span> <span class="Constant">"f0"</span><span class="Delimiter">);</span> +<span id="L310" class="LineNr">310 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original<span class="Delimiter">,</span> <span class="Constant">"f0/foo"</span><span class="Delimiter">);</span> <span id="L311" class="LineNr">311 </span><span class="Delimiter">}</span> <span id="L312" class="LineNr">312 </span> <span id="L313" class="LineNr">313 </span><span class="Delimiter">:(scenario pack_disp8)</span> @@ -389,12 +389,12 @@ if ('onhashchange' in window) { <span id="L327" class="LineNr">327 </span> <span id="L328" class="LineNr">328 </span><span class="Comment">//: helper for scenario</span> <span id="L329" class="LineNr">329 </span><span class="Delimiter">:(code)</span> -<span id="L330" class="LineNr">330 </span><span class="Normal">void</span> transform<span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L331" class="LineNr">331 </span> program p<span class="Delimiter">;</span> +<span id="L330" class="LineNr">330 </span><span class="Normal">void</span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span><span class="Normal">const</span> string& text_bytes<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L331" class="LineNr">331 </span> <a href='011run.cc.html#L99'>program</a> p<span class="Delimiter">;</span> <span id="L332" class="LineNr">332 </span> istringstream in<span class="Delimiter">(</span>text_bytes<span class="Delimiter">);</span> <span id="L333" class="LineNr">333 </span> parse<span class="Delimiter">(</span>in<span class="Delimiter">,</span> p<span class="Delimiter">);</span> -<span id="L334" class="LineNr">334 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L335" class="LineNr">335 </span> transform<span class="Delimiter">(</span>p<span class="Delimiter">);</span> +<span id="L334" class="LineNr">334 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L335" class="LineNr">335 </span> <a href='011run.cc.html#L231'>transform</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span> <span id="L336" class="LineNr">336 </span><span class="Delimiter">}</span> <span id="L337" class="LineNr">337 </span> <span id="L338" class="LineNr">338 </span><span class="Delimiter">:(scenario pack_modrm_imm32)</span> @@ -417,7 +417,7 @@ if ('onhashchange' in window) { <span id="L355" class="LineNr">355 </span>b9 <span class="Constant">0x2a</span>/imm32 <span id="L356" class="LineNr">356 </span><span class="traceContains">+transform: packing instruction 'b9 0x2a/imm32'</span> <span id="L357" class="LineNr">357 </span><span class="traceContains">+transform: instruction after packing: 'b9 2a 00 00 00'</span> -<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: copy imm32 0x0000002a to ECX</span> +<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L14'>ECX</a></span> <span id="L359" class="LineNr">359 </span> <span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenarios transform)</span> <span id="L361" class="LineNr">361 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span> @@ -438,36 +438,36 @@ if ('onhashchange' in window) { <span id="L376" class="LineNr">376 </span><span class="SalientComment">//:: helpers</span> <span id="L377" class="LineNr">377 </span> <span id="L378" class="LineNr">378 </span><span class="Delimiter">:(code)</span> -<span id="L379" class="LineNr">379 </span><span class="Normal">bool</span> all_hex_bytes<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L380" class="LineNr">380 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L381" class="LineNr">381 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> +<span id="L379" class="LineNr">379 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L380" class="LineNr">380 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L381" class="LineNr">381 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span id="L382" class="LineNr">382 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L383" class="LineNr">383 </span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L384" class="LineNr">384 </span><span class="Delimiter">}</span> <span id="L385" class="LineNr">385 </span> -<span id="L386" class="LineNr">386 </span><span class="Normal">bool</span> is_hex_byte<span class="Delimiter">(</span><span class="Normal">const</span> word& curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L387" class="LineNr">387 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_any_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> +<span id="L386" class="LineNr">386 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L386'>is_hex_byte</a><span class="Delimiter">(</span><span class="Normal">const</span> word& curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L387" class="LineNr">387 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span id="L388" class="LineNr">388 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L389" class="LineNr">389 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> +<span id="L389" class="LineNr">389 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> != <span class="Constant">2</span><span class="Delimiter">)</span> <span id="L390" class="LineNr">390 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L391" class="LineNr">391 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>find_first_not_of<span class="Delimiter">(</span><span class="Constant">"0123456789abcdefABCDEF"</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span id="L392" class="LineNr">392 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L393" class="LineNr">393 </span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L394" class="LineNr">394 </span><span class="Delimiter">}</span> <span id="L395" class="LineNr">395 </span> -<span id="L396" class="LineNr">396 </span><span class="Normal">bool</span> contains_any_operand_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word& word<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L397" class="LineNr">397 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>word<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L398" class="LineNr">398 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Instruction_operands<span class="Delimiter">.</span>find<span class="Delimiter">(</span>word<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != Instruction_operands<span class="Delimiter">.</span>end<span class="Delimiter">())</span> +<span id="L396" class="LineNr">396 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word& <a href='011run.cc.html#L123'>word</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L397" class="LineNr">397 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L398" class="LineNr">398 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">))</span> != <a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span id="L399" class="LineNr">399 </span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L400" class="LineNr">400 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L401" class="LineNr">401 </span><span class="Delimiter">}</span> <span id="L402" class="LineNr">402 </span> <span id="L403" class="LineNr">403 </span><span class="Normal">bool</span> has_operand_metadata<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& m<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L404" class="LineNr">404 </span> <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L405" class="LineNr">405 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L406" class="LineNr">406 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L405" class="LineNr">405 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L406" class="LineNr">406 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L407" class="LineNr">407 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>result<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L408" class="LineNr">408 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"' has conflicting "</span> << m << <span class="Constant">" operands</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L408" class="LineNr">408 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"' has conflicting "</span> << m << <span class="Constant">" operands</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L409" class="LineNr">409 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L410" class="LineNr">410 </span> <span class="Delimiter">}</span> <span id="L411" class="LineNr">411 </span> result =<span class="Constant"> true</span><span class="Delimiter">;</span> @@ -478,11 +478,11 @@ if ('onhashchange' in window) { <span id="L416" class="LineNr">416 </span><span class="Normal">bool</span> has_operand_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">,</span> <span class="Normal">const</span> string& m<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L417" class="LineNr">417 </span> <span class="Normal">bool</span> result =<span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L418" class="LineNr">418 </span> <span class="Normal">bool</span> metadata_found =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L419" class="LineNr">419 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L419" class="LineNr">419 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L420" class="LineNr">420 </span> <span class="Normal">const</span> string& curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L421" class="LineNr">421 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Instruction_operands<span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == Instruction_operands<span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// ignore unrecognized metadata</span> +<span id="L421" class="LineNr">421 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>find<span class="Delimiter">(</span>curr<span class="Delimiter">)</span> == <a href='030---operands.cc.html#L40'>Instruction_operands</a><span class="Delimiter">.</span>end<span class="Delimiter">())</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// ignore unrecognized metadata</span> <span id="L422" class="LineNr">422 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>metadata_found<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L423" class="LineNr">423 </span> raise << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L423" class="LineNr">423 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L424" class="LineNr">424 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L425" class="LineNr">425 </span> <span class="Delimiter">}</span> <span id="L426" class="LineNr">426 </span> metadata_found =<span class="Constant"> true</span><span class="Delimiter">;</span> @@ -491,14 +491,14 @@ if ('onhashchange' in window) { <span id="L429" class="LineNr">429 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L430" class="LineNr">430 </span><span class="Delimiter">}</span> <span id="L431" class="LineNr">431 </span> -<span id="L432" class="LineNr">432 </span>word metadata<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& m<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L433" class="LineNr">433 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L434" class="LineNr">434 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> -<span id="L435" class="LineNr">435 </span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L432" class="LineNr">432 </span><a href='011run.cc.html#L123'>word</a> metadata<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& m<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L433" class="LineNr">433 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L434" class="LineNr">434 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> m<span class="Delimiter">))</span> +<span id="L435" class="LineNr">435 </span> <span class="Identifier">return</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L436" class="LineNr">436 </span> assert<span class="Delimiter">(</span><span class="Constant">false</span><span class="Delimiter">);</span> <span id="L437" class="LineNr">437 </span><span class="Delimiter">}</span> <span id="L438" class="LineNr">438 </span> -<span id="L439" class="LineNr">439 </span><span class="Normal">bool</span> looks_like_hex_int<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L439" class="LineNr">439 </span><span class="Normal">bool</span> <a href='030---operands.cc.html#L439'>looks_like_hex_int</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L440" class="LineNr">440 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L441" class="LineNr">441 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span> || s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'+'</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L442" class="LineNr">442 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span class="Comment">// includes '0x' prefix</span> @@ -509,9 +509,9 @@ if ('onhashchange' in window) { <span id="L447" class="LineNr">447 </span><span class="Delimiter">:(code)</span> <span id="L448" class="LineNr">448 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L449" class="LineNr">449 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L450" class="LineNr">450 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L450" class="LineNr">450 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L451" class="LineNr">451 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L452" class="LineNr">452 </span> out << inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span> +<span id="L452" class="LineNr">452 </span> out << inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original<span class="Delimiter">;</span> <span id="L453" class="LineNr">453 </span> <span class="Delimiter">}</span> <span id="L454" class="LineNr">454 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span> diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html index 5ae22aa5..8e64fe65 100644 --- a/html/subx/031check_operands.cc.html +++ b/html/subx/031check_operands.cc.html @@ -73,44 +73,44 @@ if ('onhashchange' in window) { <span id="L9" class="LineNr"> 9 </span> <span id="L10" class="LineNr"> 10 </span><span class="Delimiter">:(before "Pack Operands(segment code)")</span> <span id="L11" class="LineNr"> 11 </span>check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span> -<span id="L12" class="LineNr"> 12 </span><span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L12" class="LineNr"> 12 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L13" class="LineNr"> 13 </span> <span id="L14" class="LineNr"> 14 </span><span class="Delimiter">:(code)</span> <span id="L15" class="LineNr"> 15 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L16" class="LineNr"> 16 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- check operands"</span> << end<span class="Delimiter">();</span> -<span id="L17" class="LineNr"> 17 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L18" class="LineNr"> 18 </span> check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> -<span id="L19" class="LineNr"> 19 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// stop at the first mal-formed instruction</span> +<span id="L16" class="LineNr"> 16 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- check operands"</span> << end<span class="Delimiter">();</span> +<span id="L17" class="LineNr"> 17 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L18" class="LineNr"> 18 </span> check_operands<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L19" class="LineNr"> 19 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// stop at the first mal-formed instruction</span> <span id="L20" class="LineNr"> 20 </span> <span class="Delimiter">}</span> <span id="L21" class="LineNr"> 21 </span><span class="Delimiter">}</span> <span id="L22" class="LineNr"> 22 </span> <span id="L23" class="LineNr"> 23 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L24" class="LineNr"> 24 </span> word op = preprocess_op<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> +<span id="L24" class="LineNr"> 24 </span> <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> <span id="L25" class="LineNr"> 25 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L26" class="LineNr"> 26 </span> check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L26" class="LineNr"> 26 </span> <a href='031check_operands.cc.html#L523'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> <span id="L27" class="LineNr"> 27 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L28" class="LineNr"> 28 </span> <span class="Delimiter">}</span> <span id="L29" class="LineNr"> 29 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">"f3"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L30" class="LineNr"> 30 </span> check_operands_f3<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L30" class="LineNr"> 30 </span> <a href='031check_operands.cc.html#L491'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> <span id="L31" class="LineNr"> 31 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L32" class="LineNr"> 32 </span> <span class="Delimiter">}</span> <span id="L33" class="LineNr"> 33 </span> check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span> <span id="L35" class="LineNr"> 35 </span> -<span id="L36" class="LineNr"> 36 </span>word preprocess_op<span class="Delimiter">(</span>word<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L37" class="LineNr"> 37 </span> op<span class="Delimiter">.</span>data = tolower<span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span> +<span id="L36" class="LineNr"> 36 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L37" class="LineNr"> 37 </span> op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L556'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span> <span id="L38" class="LineNr"> 38 </span> <span class="Comment">// opcodes can't be negative</span> -<span id="L39" class="LineNr"> 39 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>starts_with<span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">"0x"</span><span class="Delimiter">))</span> +<span id="L39" class="LineNr"> 39 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">"0x"</span><span class="Delimiter">))</span> <span id="L40" class="LineNr"> 40 </span> op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span> -<span id="L41" class="LineNr"> 41 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> +<span id="L41" class="LineNr"> 41 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span id="L42" class="LineNr"> 42 </span> op<span class="Delimiter">.</span>data = string<span class="Delimiter">(</span><span class="Constant">"0"</span><span class="Delimiter">)</span>+op<span class="Delimiter">.</span>data<span class="Delimiter">;</span> <span id="L43" class="LineNr"> 43 </span> <span class="Identifier">return</span> op<span class="Delimiter">;</span> <span id="L44" class="LineNr"> 44 </span><span class="Delimiter">}</span> <span id="L45" class="LineNr"> 45 </span> -<span id="L46" class="LineNr"> 46 </span><span class="Normal">void</span> test_preprocess_op<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L47" class="LineNr"> 47 </span> word w1<span class="Delimiter">;</span> w1<span class="Delimiter">.</span>data = <span class="Constant">"0xf"</span><span class="Delimiter">;</span> -<span id="L48" class="LineNr"> 48 </span> word w2<span class="Delimiter">;</span> w2<span class="Delimiter">.</span>data = <span class="Constant">"0f"</span><span class="Delimiter">;</span> -<span id="L49" class="LineNr"> 49 </span> CHECK_EQ<span class="Delimiter">(</span>preprocess_op<span class="Delimiter">(</span>w1<span class="Delimiter">).</span>data<span class="Delimiter">,</span> preprocess_op<span class="Delimiter">(</span>w2<span class="Delimiter">).</span>data<span class="Delimiter">);</span> +<span id="L46" class="LineNr"> 46 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L46'>test_preprocess_op</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L47" class="LineNr"> 47 </span> <a href='011run.cc.html#L123'>word</a> w1<span class="Delimiter">;</span> w1<span class="Delimiter">.</span>data = <span class="Constant">"0xf"</span><span class="Delimiter">;</span> +<span id="L48" class="LineNr"> 48 </span> <a href='011run.cc.html#L123'>word</a> w2<span class="Delimiter">;</span> w2<span class="Delimiter">.</span>data = <span class="Constant">"0f"</span><span class="Delimiter">;</span> +<span id="L49" class="LineNr"> 49 </span> <a href='002test.cc.html#L31'>CHECK_EQ</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>w1<span class="Delimiter">).</span>data<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>w2<span class="Delimiter">).</span>data<span class="Delimiter">);</span> <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> <span id="L52" class="LineNr"> 52 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span> @@ -118,183 +118,183 @@ if ('onhashchange' in window) { <span id="L54" class="LineNr"> 54 </span><span class="Comment">//: bitvector for each instruction's operands and compare it with the expected.</span> <span id="L55" class="LineNr"> 55 </span> <span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before "End Types")</span> -<span id="L57" class="LineNr"> 57 </span><span class="Normal">enum</span> operand_type <span class="Delimiter">{</span> +<span id="L57" class="LineNr"> 57 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L57'>operand_type</a> <span class="Delimiter">{</span> <span id="L58" class="LineNr"> 58 </span> <span class="Comment">// start from the least significant bit</span> -<span id="L59" class="LineNr"> 59 </span> MODRM<span class="Delimiter">,</span> <span class="Comment">// more complex, may also involve disp8 or disp32</span> -<span id="L60" class="LineNr"> 60 </span> SUBOP<span class="Delimiter">,</span> -<span id="L61" class="LineNr"> 61 </span> DISP8<span class="Delimiter">,</span> -<span id="L62" class="LineNr"> 62 </span> DISP16<span class="Delimiter">,</span> -<span id="L63" class="LineNr"> 63 </span> DISP32<span class="Delimiter">,</span> -<span id="L64" class="LineNr"> 64 </span> IMM8<span class="Delimiter">,</span> -<span id="L65" class="LineNr"> 65 </span> IMM32<span class="Delimiter">,</span> -<span id="L66" class="LineNr"> 66 </span> NUM_OPERAND_TYPES +<span id="L59" class="LineNr"> 59 </span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">,</span> <span class="Comment">// more complex, may also involve disp8 or disp32</span> +<span id="L60" class="LineNr"> 60 </span> <a href='031check_operands.cc.html#L60'>SUBOP</a><span class="Delimiter">,</span> +<span id="L61" class="LineNr"> 61 </span> <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">,</span> +<span id="L62" class="LineNr"> 62 </span> <a href='031check_operands.cc.html#L62'>DISP16</a><span class="Delimiter">,</span> +<span id="L63" class="LineNr"> 63 </span> <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">,</span> +<span id="L64" class="LineNr"> 64 </span> <a href='031check_operands.cc.html#L64'>IMM8</a><span class="Delimiter">,</span> +<span id="L65" class="LineNr"> 65 </span> <a href='031check_operands.cc.html#L65'>IMM32</a><span class="Delimiter">,</span> +<span id="L66" class="LineNr"> 66 </span> <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a> <span id="L67" class="LineNr"> 67 </span><span class="Delimiter">};</span> <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L69" class="LineNr"> 69 </span>vector<string> Operand_type_name<span class="Delimiter">;</span> -<span id="L70" class="LineNr"> 70 </span>map<string<span class="Delimiter">,</span> operand_type> Operand_type<span class="Delimiter">;</span> +<span id="L69" class="LineNr"> 69 </span>vector<string> <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">;</span> +<span id="L70" class="LineNr"> 70 </span>map<string<span class="Delimiter">,</span> operand_type> <a href='031check_operands.cc.html#L70'>Operand_type</a><span class="Delimiter">;</span> <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L72" class="LineNr"> 72 </span>init_op_types<span class="Delimiter">();</span> +<span id="L72" class="LineNr"> 72 </span><a href='031check_operands.cc.html#L74'>init_op_types</a><span class="Delimiter">();</span> <span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(code)</span> -<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> init_op_types<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L75" class="LineNr"> 75 </span> assert<span class="Delimiter">(</span>NUM_OPERAND_TYPES <= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span> -<span id="L76" class="LineNr"> 76 </span> Operand_type_name<span class="Delimiter">.</span>resize<span class="Delimiter">(</span>NUM_OPERAND_TYPES<span class="Delimiter">);</span> +<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L74'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L75" class="LineNr"> 75 </span> assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a> <= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L76" class="LineNr"> 76 </span> <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span> <span id="L77" class="LineNr"> 77 </span> <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span> -<span id="L78" class="LineNr"> 78 </span> DEF<span class="Delimiter">(</span>MODRM<span class="Delimiter">);</span> -<span id="L79" class="LineNr"> 79 </span> DEF<span class="Delimiter">(</span>SUBOP<span class="Delimiter">);</span> -<span id="L80" class="LineNr"> 80 </span> DEF<span class="Delimiter">(</span>DISP8<span class="Delimiter">);</span> -<span id="L81" class="LineNr"> 81 </span> DEF<span class="Delimiter">(</span>DISP16<span class="Delimiter">);</span> -<span id="L82" class="LineNr"> 82 </span> DEF<span class="Delimiter">(</span>DISP32<span class="Delimiter">);</span> -<span id="L83" class="LineNr"> 83 </span> DEF<span class="Delimiter">(</span>IMM8<span class="Delimiter">);</span> -<span id="L84" class="LineNr"> 84 </span> DEF<span class="Delimiter">(</span>IMM32<span class="Delimiter">);</span> +<span id="L78" class="LineNr"> 78 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span> +<span id="L79" class="LineNr"> 79 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L60'>SUBOP</a><span class="Delimiter">);</span> +<span id="L80" class="LineNr"> 80 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">);</span> +<span id="L81" class="LineNr"> 81 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L62'>DISP16</a><span class="Delimiter">);</span> +<span id="L82" class="LineNr"> 82 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">);</span> +<span id="L83" class="LineNr"> 83 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>IMM8</a><span class="Delimiter">);</span> +<span id="L84" class="LineNr"> 84 </span> DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L65'>IMM32</a><span class="Delimiter">);</span> <span id="L85" class="LineNr"> 85 </span> <span class="Comment">#undef DEF</span> <span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span> <span id="L87" class="LineNr"> 87 </span> <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L89" class="LineNr"> 89 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>> Permitted_operands<span class="Delimiter">;</span> -<span id="L90" class="LineNr"> 90 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> INVALID_OPERANDS = <span class="Constant">0xff</span><span class="Delimiter">;</span> <span class="Comment">// no instruction uses all the operand types</span> +<span id="L89" class="LineNr"> 89 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>> <a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">;</span> +<span id="L90" class="LineNr"> 90 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span> <span class="Comment">// no instruction uses all the operand types</span> <span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L92" class="LineNr"> 92 </span>init_permitted_operands<span class="Delimiter">();</span> +<span id="L92" class="LineNr"> 92 </span><a href='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">();</span> <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(code)</span> -<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> init_permitted_operands<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L95" class="LineNr"> 95 </span> <span class="SalientComment">//// Class A: just op, no operands</span> <span id="L96" class="LineNr"> 96 </span> <span class="Comment">// halt</span> -<span id="L97" class="LineNr"> 97 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"f4"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L97" class="LineNr"> 97 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"f4"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L98" class="LineNr"> 98 </span> <span class="Comment">// inc</span> -<span id="L99" class="LineNr"> 99 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"40"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L100" class="LineNr">100 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"41"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L101" class="LineNr">101 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"42"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L102" class="LineNr">102 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"43"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L103" class="LineNr">103 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"44"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L104" class="LineNr">104 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"45"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L105" class="LineNr">105 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"46"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L106" class="LineNr">106 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"47"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L99" class="LineNr"> 99 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"40"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L100" class="LineNr">100 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"41"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L101" class="LineNr">101 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"42"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L102" class="LineNr">102 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"43"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L103" class="LineNr">103 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"44"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L104" class="LineNr">104 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"45"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L105" class="LineNr">105 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"46"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L106" class="LineNr">106 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"47"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L107" class="LineNr">107 </span> <span class="Comment">// dec</span> -<span id="L108" class="LineNr">108 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"48"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L109" class="LineNr">109 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"49"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L110" class="LineNr">110 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"4a"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L111" class="LineNr">111 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"4b"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L112" class="LineNr">112 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"4c"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L113" class="LineNr">113 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"4d"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L114" class="LineNr">114 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"4e"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L115" class="LineNr">115 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"4f"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L108" class="LineNr">108 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"48"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L109" class="LineNr">109 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"49"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L110" class="LineNr">110 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"4a"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L111" class="LineNr">111 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"4b"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L112" class="LineNr">112 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"4c"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L113" class="LineNr">113 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"4d"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L114" class="LineNr">114 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"4e"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L115" class="LineNr">115 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"4f"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L116" class="LineNr">116 </span> <span class="Comment">// push</span> -<span id="L117" class="LineNr">117 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"50"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L118" class="LineNr">118 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"51"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L119" class="LineNr">119 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"52"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L120" class="LineNr">120 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"53"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L121" class="LineNr">121 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"54"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L122" class="LineNr">122 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"55"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L123" class="LineNr">123 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"56"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L124" class="LineNr">124 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"57"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L117" class="LineNr">117 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"50"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L118" class="LineNr">118 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"51"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L119" class="LineNr">119 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"52"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L120" class="LineNr">120 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"53"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L121" class="LineNr">121 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"54"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L122" class="LineNr">122 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"55"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L123" class="LineNr">123 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"56"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L124" class="LineNr">124 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"57"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L125" class="LineNr">125 </span> <span class="Comment">// pop</span> -<span id="L126" class="LineNr">126 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"58"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L127" class="LineNr">127 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"59"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L128" class="LineNr">128 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"5a"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L129" class="LineNr">129 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"5b"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L130" class="LineNr">130 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"5c"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L131" class="LineNr">131 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"5d"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L132" class="LineNr">132 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"5e"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> -<span id="L133" class="LineNr">133 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"5f"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L126" class="LineNr">126 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"58"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L127" class="LineNr">127 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"59"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L128" class="LineNr">128 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"5a"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L129" class="LineNr">129 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"5b"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L130" class="LineNr">130 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"5c"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L131" class="LineNr">131 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"5d"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L132" class="LineNr">132 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"5e"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L133" class="LineNr">133 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"5f"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L134" class="LineNr">134 </span> <span class="Comment">// return</span> -<span id="L135" class="LineNr">135 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"c3"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> +<span id="L135" class="LineNr">135 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"c3"</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span> <span id="L136" class="LineNr">136 </span> <span id="L137" class="LineNr">137 </span> <span class="SalientComment">//// Class B: just op and disp8</span> <span id="L138" class="LineNr">138 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L139" class="LineNr">139 </span> <span class="Comment">// 0 0 0 |0 1 0 0</span> <span id="L140" class="LineNr">140 </span> <span id="L141" class="LineNr">141 </span> <span class="Comment">// jump</span> -<span id="L142" class="LineNr">142 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"eb"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> -<span id="L143" class="LineNr">143 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"74"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> -<span id="L144" class="LineNr">144 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"75"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> -<span id="L145" class="LineNr">145 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"7c"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> -<span id="L146" class="LineNr">146 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"7d"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> -<span id="L147" class="LineNr">147 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"7e"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> -<span id="L148" class="LineNr">148 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"7f"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L142" class="LineNr">142 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"eb"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L143" class="LineNr">143 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"74"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L144" class="LineNr">144 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"75"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L145" class="LineNr">145 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"7c"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L146" class="LineNr">146 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"7d"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L147" class="LineNr">147 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"7e"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> +<span id="L148" class="LineNr">148 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"7f"</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span> <span id="L149" class="LineNr">149 </span> <span id="L150" class="LineNr">150 </span> <span class="SalientComment">//// Class C: just op and disp16</span> <span id="L151" class="LineNr">151 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L152" class="LineNr">152 </span> <span class="Comment">// 0 0 0 |1 0 0 0</span> -<span id="L153" class="LineNr">153 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"e9"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> <span class="Comment">// jump</span> +<span id="L153" class="LineNr">153 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"e9"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> <span class="Comment">// jump</span> <span id="L154" class="LineNr">154 </span> <span id="L155" class="LineNr">155 </span> <span class="SalientComment">//// Class D: just op and disp32</span> <span id="L156" class="LineNr">156 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L157" class="LineNr">157 </span> <span class="Comment">// 0 0 1 |0 0 0 0</span> -<span id="L158" class="LineNr">158 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"e8"</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span> <span class="Comment">// call</span> +<span id="L158" class="LineNr">158 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"e8"</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span> <span class="Comment">// call</span> <span id="L159" class="LineNr">159 </span> <span id="L160" class="LineNr">160 </span> <span class="SalientComment">//// Class E: just op and imm8</span> <span id="L161" class="LineNr">161 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L162" class="LineNr">162 </span> <span class="Comment">// 0 1 0 |0 0 0 0</span> -<span id="L163" class="LineNr">163 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"cd"</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span> <span class="Comment">// software interrupt</span> +<span id="L163" class="LineNr">163 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"cd"</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span> <span class="Comment">// software interrupt</span> <span id="L164" class="LineNr">164 </span> <span id="L165" class="LineNr">165 </span> <span class="SalientComment">//// Class F: just op and imm32</span> <span id="L166" class="LineNr">166 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L167" class="LineNr">167 </span> <span class="Comment">// 1 0 0 |0 0 0 0</span> -<span id="L168" class="LineNr">168 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"05"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// add</span> -<span id="L169" class="LineNr">169 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"2d"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// subtract</span> -<span id="L170" class="LineNr">170 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"25"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// and</span> -<span id="L171" class="LineNr">171 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"0d"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// or</span> -<span id="L172" class="LineNr">172 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"35"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// xor</span> -<span id="L173" class="LineNr">173 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"3d"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// compare</span> -<span id="L174" class="LineNr">174 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"68"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// push</span> +<span id="L168" class="LineNr">168 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"05"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// add</span> +<span id="L169" class="LineNr">169 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"2d"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// subtract</span> +<span id="L170" class="LineNr">170 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"25"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// and</span> +<span id="L171" class="LineNr">171 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"0d"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// or</span> +<span id="L172" class="LineNr">172 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"35"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// xor</span> +<span id="L173" class="LineNr">173 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"3d"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// compare</span> +<span id="L174" class="LineNr">174 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"68"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span class="Comment">// push</span> <span id="L175" class="LineNr">175 </span> <span class="Comment">// copy</span> -<span id="L176" class="LineNr">176 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"b8"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L177" class="LineNr">177 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"b9"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L178" class="LineNr">178 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"ba"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L179" class="LineNr">179 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"bb"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L180" class="LineNr">180 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"bc"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L181" class="LineNr">181 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"bd"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L182" class="LineNr">182 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"be"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> -<span id="L183" class="LineNr">183 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"bf"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L176" class="LineNr">176 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"b8"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L177" class="LineNr">177 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"b9"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L178" class="LineNr">178 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"ba"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L179" class="LineNr">179 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"bb"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L180" class="LineNr">180 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"bc"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L181" class="LineNr">181 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"bd"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L182" class="LineNr">182 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"be"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> +<span id="L183" class="LineNr">183 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"bf"</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span> <span id="L184" class="LineNr">184 </span> <span id="L185" class="LineNr">185 </span> <span class="SalientComment">//// Class M: using ModR/M byte</span> <span id="L186" class="LineNr">186 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L187" class="LineNr">187 </span> <span class="Comment">// 0 0 0 |0 0 0 1</span> <span id="L188" class="LineNr">188 </span> <span id="L189" class="LineNr">189 </span> <span class="Comment">// add</span> -<span id="L190" class="LineNr">190 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"01"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L191" class="LineNr">191 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"03"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L190" class="LineNr">190 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"01"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L191" class="LineNr">191 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"03"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L192" class="LineNr">192 </span> <span class="Comment">// subtract</span> -<span id="L193" class="LineNr">193 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"29"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L194" class="LineNr">194 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"2b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L193" class="LineNr">193 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"29"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L194" class="LineNr">194 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"2b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L195" class="LineNr">195 </span> <span class="Comment">// and</span> -<span id="L196" class="LineNr">196 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"21"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L197" class="LineNr">197 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"23"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L196" class="LineNr">196 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"21"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L197" class="LineNr">197 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"23"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L198" class="LineNr">198 </span> <span class="Comment">// or</span> -<span id="L199" class="LineNr">199 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"09"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L200" class="LineNr">200 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"0b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L199" class="LineNr">199 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"09"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L200" class="LineNr">200 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"0b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L201" class="LineNr">201 </span> <span class="Comment">// xor</span> -<span id="L202" class="LineNr">202 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"31"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L203" class="LineNr">203 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"33"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L202" class="LineNr">202 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"31"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L203" class="LineNr">203 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"33"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L204" class="LineNr">204 </span> <span class="Comment">// compare</span> -<span id="L205" class="LineNr">205 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"39"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L206" class="LineNr">206 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"3b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L205" class="LineNr">205 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"39"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L206" class="LineNr">206 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"3b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L207" class="LineNr">207 </span> <span class="Comment">// copy</span> -<span id="L208" class="LineNr">208 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"88"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L209" class="LineNr">209 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"89"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L210" class="LineNr">210 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"8a"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> -<span id="L211" class="LineNr">211 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"8b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L208" class="LineNr">208 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"88"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L209" class="LineNr">209 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"89"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L210" class="LineNr">210 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"8a"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L211" class="LineNr">211 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"8b"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L212" class="LineNr">212 </span> <span class="Comment">// swap</span> -<span id="L213" class="LineNr">213 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"87"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L213" class="LineNr">213 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"87"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L214" class="LineNr">214 </span> <span class="Comment">// copy address (lea)</span> -<span id="L215" class="LineNr">215 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L215" class="LineNr">215 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L216" class="LineNr">216 </span> <span class="Comment">// pop</span> -<span id="L217" class="LineNr">217 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L217" class="LineNr">217 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L218" class="LineNr">218 </span> <span id="L219" class="LineNr">219 </span> <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span> <span id="L220" class="LineNr">220 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L221" class="LineNr">221 </span> <span class="Comment">// 0 0 0 |0 0 1 1</span> -<span id="L222" class="LineNr">222 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"f7"</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span> <span class="Comment">// test/not/mul/div</span> -<span id="L223" class="LineNr">223 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"ff"</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span> <span class="Comment">// jump/push/call</span> +<span id="L222" class="LineNr">222 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"f7"</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span> <span class="Comment">// test/not/mul/div</span> +<span id="L223" class="LineNr">223 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"ff"</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span> <span class="Comment">// jump/push/call</span> <span id="L224" class="LineNr">224 </span> <span id="L225" class="LineNr">225 </span> <span class="SalientComment">//// Class N: op, ModR/M and imm32</span> <span id="L226" class="LineNr">226 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L227" class="LineNr">227 </span> <span class="Comment">// 1 0 0 |0 0 0 1</span> -<span id="L228" class="LineNr">228 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"c7"</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span> <span class="Comment">// copy</span> +<span id="L228" class="LineNr">228 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"c7"</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span> <span class="Comment">// copy</span> <span id="L229" class="LineNr">229 </span> <span id="L230" class="LineNr">230 </span> <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span> <span id="L231" class="LineNr">231 </span> <span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L232" class="LineNr">232 </span> <span class="Comment">// 1 0 0 |0 0 1 1</span> -<span id="L233" class="LineNr">233 </span> put<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> <span class="Constant">"81"</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span> <span class="Comment">// combine</span> +<span id="L233" class="LineNr">233 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">"81"</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span> <span class="Comment">// combine</span> <span id="L234" class="LineNr">234 </span> <span id="L235" class="LineNr">235 </span> <span class="Comment">// End Init Permitted Operands</span> <span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span> @@ -306,61 +306,61 @@ if ('onhashchange' in window) { <span id="L242" class="LineNr">242 </span> <span id="L243" class="LineNr">243 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L244" class="LineNr">244 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L245" class="LineNr">245 </span> <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span>Permitted_operands<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> -<span id="L246" class="LineNr">246 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> MODRM<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L247" class="LineNr">247 </span> check_operands_modrm<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> -<span id="L248" class="LineNr">248 </span> compare_bitvector_modrm<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L245" class="LineNr">245 </span> <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L89'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L246" class="LineNr">246 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L247" class="LineNr">247 </span> <a href='031check_operands.cc.html#L341'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L248" class="LineNr">248 </span> <a href='031check_operands.cc.html#L368'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span id="L249" class="LineNr">249 </span> <span class="Delimiter">}</span> <span id="L250" class="LineNr">250 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L251" class="LineNr">251 </span> compare_bitvector<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L251" class="LineNr">251 </span> <a href='031check_operands.cc.html#L257'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span id="L252" class="LineNr">252 </span> <span class="Delimiter">}</span> <span id="L253" class="LineNr">253 </span><span class="Delimiter">}</span> <span id="L254" class="LineNr">254 </span> <span id="L255" class="LineNr">255 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span> <span id="L256" class="LineNr">256 </span> -<span id="L257" class="LineNr">257 </span><span class="Normal">void</span> compare_bitvector<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L258" class="LineNr">258 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> && has_operands<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> -<span id="L259" class="LineNr">259 </span> <span class="Normal">uint8_t</span> bitvector = compute_operand_bitvector<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> -<span id="L260" class="LineNr">260 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> +<span id="L257" class="LineNr">257 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L257'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L258" class="LineNr">258 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> && <a href='031check_operands.cc.html#L292'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> +<span id="L259" class="LineNr">259 </span> <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L260" class="LineNr">260 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> <span id="L261" class="LineNr">261 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// all good with this instruction</span> -<span id="L262" class="LineNr">262 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < NUM_OPERAND_TYPES<span class="Delimiter">;</span> ++i<span class="Delimiter">,</span> bitvector >>= <span class="Constant">1</span><span class="Delimiter">,</span> expected >>= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L262" class="LineNr">262 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span> ++i<span class="Delimiter">,</span> bitvector >>= <span class="Constant">1</span><span class="Delimiter">,</span> expected >>= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L263" class="LineNr">263 </span><span class="CommentedCode">//? cerr << "comparing " << HEXBYTE << NUM(bitvector) << " with " << NUM(expected) << '\n';</span> <span id="L264" class="LineNr">264 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector & <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected & <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// all good with this operand</span> -<span id="L265" class="LineNr">265 </span> <span class="Normal">const</span> string& optype = Operand_type_name<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L265" class="LineNr">265 </span> <span class="Normal">const</span> string& optype = <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L266" class="LineNr">266 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector & <span class="Constant">0x1</span><span class="Delimiter">)</span> > <span class="Delimiter">(</span>expected & <span class="Constant">0x1</span><span class="Delimiter">))</span> -<span id="L267" class="LineNr">267 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L267" class="LineNr">267 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L268" class="LineNr">268 </span> <span class="Normal">else</span> -<span id="L269" class="LineNr">269 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L269" class="LineNr">269 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L270" class="LineNr">270 </span> <span class="Comment">// continue giving all errors for a single instruction</span> <span id="L271" class="LineNr">271 </span> <span class="Delimiter">}</span> <span id="L272" class="LineNr">272 </span> <span class="Comment">// ignore settings in any unused bits</span> <span id="L273" class="LineNr">273 </span><span class="Delimiter">}</span> <span id="L274" class="LineNr">274 </span> -<span id="L275" class="LineNr">275 </span>string maybe_name<span class="Delimiter">(</span><span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L275" class="LineNr">275 </span>string <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L276" class="LineNr">276 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> -<span id="L277" class="LineNr">277 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> +<span id="L277" class="LineNr">277 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L278" class="LineNr">278 </span> <span class="Comment">// strip stuff in parens from the name</span> -<span id="L279" class="LineNr">279 </span> <span class="Normal">const</span> string& s = get<span class="Delimiter">(</span>Name<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L279" class="LineNr">279 </span> <span class="Normal">const</span> string& s = get<span class="Delimiter">(</span><a href='010---vm.cc.html#L369'>Name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L280" class="LineNr">280 </span> <span class="Identifier">return</span> <span class="Constant">" ("</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">" ("</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span> <span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span> <span id="L282" class="LineNr">282 </span> -<span id="L283" class="LineNr">283 </span><span class="Normal">uint32_t</span> compute_operand_bitvector<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L283" class="LineNr">283 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L284" class="LineNr">284 </span> <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L285" class="LineNr">285 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L286" class="LineNr">286 </span> bitvector = bitvector | bitvector_for_operand<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> -<span id="L287" class="LineNr">287 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span> INVALID_OPERANDS<span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> +<span id="L285" class="LineNr">285 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L286" class="LineNr">286 </span> bitvector = bitvector | <a href='031check_operands.cc.html#L309'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L287" class="LineNr">287 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> <span id="L288" class="LineNr">288 </span> <span class="Delimiter">}</span> <span id="L289" class="LineNr">289 </span> <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span> <span id="L290" class="LineNr">290 </span><span class="Delimiter">}</span> <span id="L291" class="LineNr">291 </span> -<span id="L292" class="LineNr">292 </span><span class="Normal">bool</span> has_operands<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L293" class="LineNr">293 </span> <span class="Identifier">return</span> SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> > first_operand<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L292" class="LineNr">292 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L292'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L293" class="LineNr">293 </span> <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> > <a href='031check_operands.cc.html#L296'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> <span id="L294" class="LineNr">294 </span><span class="Delimiter">}</span> <span id="L295" class="LineNr">295 </span> -<span id="L296" class="LineNr">296 </span><span class="Normal">int</span> first_operand<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L297" class="LineNr">297 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span> -<span id="L298" class="LineNr">298 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f2"</span> || inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f3"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L299" class="LineNr">299 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> +<span id="L296" class="LineNr">296 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L296'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L297" class="LineNr">297 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span> +<span id="L298" class="LineNr">298 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f2"</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"f3"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L299" class="LineNr">299 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">)</span> <span id="L300" class="LineNr">300 </span> <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span> <span id="L301" class="LineNr">301 </span> <span class="Normal">else</span> <span id="L302" class="LineNr">302 </span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span> @@ -370,17 +370,17 @@ if ('onhashchange' in window) { <span id="L306" class="LineNr">306 </span> <span id="L307" class="LineNr">307 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span> <span id="L308" class="LineNr">308 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span> -<span id="L309" class="LineNr">309 </span><span class="Normal">uint32_t</span> bitvector_for_operand<span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L309" class="LineNr">309 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L309'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L310" class="LineNr">310 </span> <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L311" class="LineNr">311 </span> <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L312" class="LineNr">312 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L312" class="LineNr">312 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L313" class="LineNr">313 </span> <span class="Normal">const</span> string& curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L314" class="LineNr">314 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Operand_type<span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// ignore unrecognized metadata</span> +<span id="L314" class="LineNr">314 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// ignore unrecognized metadata</span> <span id="L315" class="LineNr">315 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L316" class="LineNr">316 </span> raise << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L317" class="LineNr">317 </span> <span class="Identifier">return</span> INVALID_OPERANDS<span class="Delimiter">;</span> +<span id="L316" class="LineNr">316 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' has conflicting operand types; it should have only one</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L317" class="LineNr">317 </span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span> <span id="L318" class="LineNr">318 </span> <span class="Delimiter">}</span> -<span id="L319" class="LineNr">319 </span> bv = <span class="Delimiter">(</span><span class="Constant">1</span> << get<span class="Delimiter">(</span>Operand_type<span class="Delimiter">,</span> curr<span class="Delimiter">));</span> +<span id="L319" class="LineNr">319 </span> bv = <span class="Delimiter">(</span><span class="Constant">1</span> << get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span> <span id="L320" class="LineNr">320 </span> found =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L321" class="LineNr">321 </span> <span class="Delimiter">}</span> <span id="L322" class="LineNr">322 </span> <span class="Identifier">return</span> bv<span class="Delimiter">;</span> @@ -402,26 +402,26 @@ if ('onhashchange' in window) { <span id="L338" class="LineNr">338 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span> <span id="L339" class="LineNr">339 </span> <span id="L340" class="LineNr">340 </span><span class="Delimiter">:(code)</span> -<span id="L341" class="LineNr">341 </span><span class="Normal">void</span> check_operands_modrm<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L342" class="LineNr">342 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> -<span id="L343" class="LineNr">343 </span> check_operand_metadata_present<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> -<span id="L344" class="LineNr">344 </span> check_operand_metadata_present<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L341" class="LineNr">341 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L341'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L342" class="LineNr">342 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> +<span id="L343" class="LineNr">343 </span> <a href='031check_operands.cc.html#L402'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L344" class="LineNr">344 </span> <a href='031check_operands.cc.html#L402'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span id="L345" class="LineNr">345 </span> <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span> <span id="L346" class="LineNr">346 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">"81"</span> || op<span class="Delimiter">.</span>data == <span class="Constant">"8f"</span> || op<span class="Delimiter">.</span>data == <span class="Constant">"ff"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span class="Comment">// keep sync'd with 'help subop'</span> -<span id="L347" class="LineNr">347 </span> check_operand_metadata_present<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> -<span id="L348" class="LineNr">348 </span> check_operand_metadata_absent<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">"should be replaced by subop"</span><span class="Delimiter">);</span> +<span id="L347" class="LineNr">347 </span> <a href='031check_operands.cc.html#L402'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L348" class="LineNr">348 </span> <a href='031check_operands.cc.html#L407'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">"should be replaced by subop"</span><span class="Delimiter">);</span> <span id="L349" class="LineNr">349 </span> <span class="Delimiter">}</span> -<span id="L350" class="LineNr">350 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L350" class="LineNr">350 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L351" class="LineNr">351 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">).</span>data != <span class="Constant">"4"</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L352" class="LineNr">352 </span> <span class="Comment">// SIB byte checks</span> -<span id="L353" class="LineNr">353 </span> <span class="Normal">uint8_t</span> mod = hex_byte<span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> +<span id="L353" class="LineNr">353 </span> <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> <span id="L354" class="LineNr">354 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L355" class="LineNr">355 </span> check_operand_metadata_present<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> -<span id="L356" class="LineNr">356 </span> check_operand_metadata_present<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span class="Comment">// otherwise why go to SIB?</span> +<span id="L355" class="LineNr">355 </span> <a href='031check_operands.cc.html#L402'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L356" class="LineNr">356 </span> <a href='031check_operands.cc.html#L402'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span class="Comment">// otherwise why go to SIB?</span> <span id="L357" class="LineNr">357 </span> <span class="Delimiter">}</span> <span id="L358" class="LineNr">358 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L359" class="LineNr">359 </span> check_operand_metadata_absent<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">"direct mode"</span><span class="Delimiter">);</span> -<span id="L360" class="LineNr">360 </span> check_operand_metadata_absent<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">"direct mode"</span><span class="Delimiter">);</span> +<span id="L359" class="LineNr">359 </span> <a href='031check_operands.cc.html#L407'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">"direct mode"</span><span class="Delimiter">);</span> +<span id="L360" class="LineNr">360 </span> <a href='031check_operands.cc.html#L407'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">"direct mode"</span><span class="Delimiter">);</span> <span id="L361" class="LineNr">361 </span> <span class="Delimiter">}</span> <span id="L362" class="LineNr">362 </span> <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span> <span id="L363" class="LineNr">363 </span><span class="Delimiter">}</span> @@ -429,48 +429,48 @@ if ('onhashchange' in window) { <span id="L365" class="LineNr">365 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span> <span id="L366" class="LineNr">366 </span><span class="Comment">// exception 1: ignore modrm bit since we already checked it above</span> <span id="L367" class="LineNr">367 </span><span class="Comment">// exception 2: modrm instructions can use a displacement on occasion</span> -<span id="L368" class="LineNr">368 </span><span class="Normal">void</span> compare_bitvector_modrm<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L369" class="LineNr">369 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> && has_operands<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> -<span id="L370" class="LineNr">370 </span> <span class="Normal">uint8_t</span> bitvector = compute_operand_bitvector<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> -<span id="L371" class="LineNr">371 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> -<span id="L372" class="LineNr">372 </span> expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> MODRM<span class="Delimiter">);</span> <span class="Comment">// exception 1</span> +<span id="L368" class="LineNr">368 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L368'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L369" class="LineNr">369 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> && <a href='031check_operands.cc.html#L292'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> +<span id="L370" class="LineNr">370 </span> <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L371" class="LineNr">371 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> +<span id="L372" class="LineNr">372 </span> expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span> <span class="Comment">// exception 1</span> <span id="L373" class="LineNr">373 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// all good with this instruction</span> -<span id="L374" class="LineNr">374 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < NUM_OPERAND_TYPES<span class="Delimiter">;</span> ++i<span class="Delimiter">,</span> bitvector >>= <span class="Constant">1</span><span class="Delimiter">,</span> expected >>= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L374" class="LineNr">374 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span> ++i<span class="Delimiter">,</span> bitvector >>= <span class="Constant">1</span><span class="Delimiter">,</span> expected >>= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L375" class="LineNr">375 </span><span class="CommentedCode">//? cerr << "comparing for modrm " << HEXBYTE << NUM(bitvector) << " with " << NUM(expected) << '\n';</span> <span id="L376" class="LineNr">376 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector & <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected & <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// all good with this operand</span> -<span id="L377" class="LineNr">377 </span> <span class="Normal">const</span> string& optype = Operand_type_name<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L378" class="LineNr">378 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i == DISP8<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L379" class="LineNr">379 </span> <span class="Normal">int32_t</span> mod = parse_int<span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> +<span id="L377" class="LineNr">377 </span> <span class="Normal">const</span> string& optype = <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L378" class="LineNr">378 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L379" class="LineNr">379 </span> <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> <span id="L380" class="LineNr">380 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">1</span><span class="Delimiter">)</span> -<span id="L381" class="LineNr">381 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L381" class="LineNr">381 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L382" class="LineNr">382 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// exception 2</span> <span id="L383" class="LineNr">383 </span> <span class="Delimiter">}</span> -<span id="L384" class="LineNr">384 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i == DISP32<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L385" class="LineNr">385 </span> <span class="Normal">int32_t</span> mod = parse_int<span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> -<span id="L386" class="LineNr">386 </span> <span class="Normal">int32_t</span> rm32 = parse_int<span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> +<span id="L384" class="LineNr">384 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L385" class="LineNr">385 </span> <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> +<span id="L386" class="LineNr">386 </span> <span class="Normal">int32_t</span> rm32 = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span> <span id="L387" class="LineNr">387 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">0</span> && rm32 == <span class="Constant">5</span><span class="Delimiter">)</span> <span id="L388" class="LineNr">388 </span> <span class="Delimiter">;</span> <span class="Comment">// ok: special-case for loading address from disp32</span> <span id="L389" class="LineNr">389 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">2</span><span class="Delimiter">)</span> -<span id="L390" class="LineNr">390 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L390" class="LineNr">390 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L391" class="LineNr">391 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// exception 2</span> <span id="L392" class="LineNr">392 </span> <span class="Delimiter">}</span> <span id="L393" class="LineNr">393 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector & <span class="Constant">0x1</span><span class="Delimiter">)</span> > <span class="Delimiter">(</span>expected & <span class="Constant">0x1</span><span class="Delimiter">))</span> -<span id="L394" class="LineNr">394 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L394" class="LineNr">394 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L395" class="LineNr">395 </span> <span class="Normal">else</span> -<span id="L396" class="LineNr">396 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L396" class="LineNr">396 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L397" class="LineNr">397 </span> <span class="Comment">// continue giving all errors for a single instruction</span> <span id="L398" class="LineNr">398 </span> <span class="Delimiter">}</span> <span id="L399" class="LineNr">399 </span> <span class="Comment">// ignore settings in any unused bits</span> <span id="L400" class="LineNr">400 </span><span class="Delimiter">}</span> <span id="L401" class="LineNr">401 </span> -<span id="L402" class="LineNr">402 </span><span class="Normal">void</span> check_operand_metadata_present<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& type<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L402" class="LineNr">402 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L402'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& type<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L403" class="LineNr">403 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span> -<span id="L404" class="LineNr">404 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << type << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L404" class="LineNr">404 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << type << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L405" class="LineNr">405 </span><span class="Delimiter">}</span> <span id="L406" class="LineNr">406 </span> -<span id="L407" class="LineNr">407 </span><span class="Normal">void</span> check_operand_metadata_absent<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& type<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">,</span> <span class="Normal">const</span> string& msg<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L407" class="LineNr">407 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L407'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> string& type<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">,</span> <span class="Normal">const</span> string& msg<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L408" class="LineNr">408 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span> -<span id="L409" class="LineNr">409 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << type << <span class="Constant">" operand ("</span> << msg << <span class="Constant">")</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L409" class="LineNr">409 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L275'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << type << <span class="Constant">" operand ("</span> << msg << <span class="Constant">")</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L410" class="LineNr">410 </span><span class="Delimiter">}</span> <span id="L411" class="LineNr">411 </span> <span id="L412" class="LineNr">412 </span><span class="Delimiter">:(scenarios transform)</span> @@ -538,22 +538,22 @@ if ('onhashchange' in window) { <span id="L474" class="LineNr">474 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span> <span id="L475" class="LineNr">475 </span> <span id="L476" class="LineNr">476 </span><span class="Delimiter">:(code)</span> -<span id="L477" class="LineNr">477 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L478" class="LineNr">478 </span> assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">);</span> -<span id="L479" class="LineNr">479 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L480" class="LineNr">480 </span> raise << <span class="Constant">"opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L477" class="LineNr">477 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L523'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L478" class="LineNr">478 </span> assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">"0f"</span><span class="Delimiter">);</span> +<span id="L479" class="LineNr">479 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L480" class="LineNr">480 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L481" class="LineNr">481 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L482" class="LineNr">482 </span> <span class="Delimiter">}</span> -<span id="L483" class="LineNr">483 </span> word op = preprocess_op<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span> -<span id="L484" class="LineNr">484 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L485" class="LineNr">485 </span> raise << <span class="Constant">"unknown 2-byte opcode '0f "</span> << op<span class="Delimiter">.</span>data << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L483" class="LineNr">483 </span> <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span> +<span id="L484" class="LineNr">484 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L485" class="LineNr">485 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"unknown 2-byte opcode '0f "</span> << op<span class="Delimiter">.</span>data << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L486" class="LineNr">486 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L487" class="LineNr">487 </span> <span class="Delimiter">}</span> -<span id="L488" class="LineNr">488 </span> check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L488" class="LineNr">488 </span> <a href='031check_operands.cc.html#L523'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> <span id="L489" class="LineNr">489 </span><span class="Delimiter">}</span> <span id="L490" class="LineNr">490 </span> -<span id="L491" class="LineNr">491 </span><span class="Normal">void</span> check_operands_f3<span class="Delimiter">(</span><span class="Normal">const</span> line& <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L492" class="LineNr">492 </span> raise << <span class="Constant">"no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L491" class="LineNr">491 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L491'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line& <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L492" class="LineNr">492 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L493" class="LineNr">493 </span><span class="Delimiter">}</span> <span id="L494" class="LineNr">494 </span> <span id="L495" class="LineNr">495 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span> @@ -566,61 +566,61 @@ if ('onhashchange' in window) { <span id="L502" class="LineNr">502 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if equal, if ZF is set): missing disp16 operand</span> <span id="L503" class="LineNr">503 </span> <span id="L504" class="LineNr">504 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L505" class="LineNr">505 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>> Permitted_operands_0f<span class="Delimiter">;</span> +<span id="L505" class="LineNr">505 </span>map<<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>> <a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">;</span> <span id="L506" class="LineNr">506 </span><span class="Delimiter">:(before "End Init Permitted Operands")</span> <span id="L507" class="LineNr">507 </span><span class="SalientComment">//// Class C: just op and disp16</span> <span id="L508" class="LineNr">508 </span><span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L509" class="LineNr">509 </span><span class="Comment">// 0 0 0 |1 0 0 0</span> -<span id="L510" class="LineNr">510 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"84"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> -<span id="L511" class="LineNr">511 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"85"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> -<span id="L512" class="LineNr">512 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"8c"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> -<span id="L513" class="LineNr">513 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> -<span id="L514" class="LineNr">514 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"8e"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> -<span id="L515" class="LineNr">515 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> +<span id="L510" class="LineNr">510 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"84"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> +<span id="L511" class="LineNr">511 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"85"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> +<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"8c"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> +<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"8d"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> +<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"8e"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> +<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"8f"</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span> <span id="L516" class="LineNr">516 </span> <span id="L517" class="LineNr">517 </span><span class="SalientComment">//// Class M: using ModR/M byte</span> <span id="L518" class="LineNr">518 </span><span class="Comment">// imm32 imm8 disp32 |disp16 disp8 subop modrm</span> <span id="L519" class="LineNr">519 </span><span class="Comment">// 0 0 0 |0 0 0 1</span> -<span id="L520" class="LineNr">520 </span>put_new<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> <span class="Constant">"af"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> +<span id="L520" class="LineNr">520 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">"af"</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span> <span id="L521" class="LineNr">521 </span> <span id="L522" class="LineNr">522 </span><span class="Delimiter">:(code)</span> -<span id="L523" class="LineNr">523 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L524" class="LineNr">524 </span> <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span>Permitted_operands_0f<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> -<span id="L525" class="LineNr">525 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> MODRM<span class="Delimiter">))</span> -<span id="L526" class="LineNr">526 </span> check_operands_modrm<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> -<span id="L527" class="LineNr">527 </span> compare_bitvector_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> MODRM<span class="Delimiter">),</span> op<span class="Delimiter">);</span> +<span id="L523" class="LineNr">523 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L523'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L524" class="LineNr">524 </span> <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L505'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L525" class="LineNr">525 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span> +<span id="L526" class="LineNr">526 </span> <a href='031check_operands.cc.html#L341'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span> +<span id="L527" class="LineNr">527 </span> <a href='031check_operands.cc.html#L530'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span> <span id="L528" class="LineNr">528 </span><span class="Delimiter">}</span> <span id="L529" class="LineNr">529 </span> -<span id="L530" class="LineNr">530 </span><span class="Normal">void</span> compare_bitvector_0f<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L531" class="LineNr">531 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> && has_operands<span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> -<span id="L532" class="LineNr">532 </span> <span class="Normal">uint8_t</span> bitvector = compute_operand_bitvector<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> -<span id="L533" class="LineNr">533 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> +<span id="L530" class="LineNr">530 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L530'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L531" class="LineNr">531 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> && <a href='031check_operands.cc.html#L292'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span> +<span id="L532" class="LineNr">532 </span> <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L283'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L533" class="LineNr">533 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// duplicate operand type</span> <span id="L534" class="LineNr">534 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// all good with this instruction</span> -<span id="L535" class="LineNr">535 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < NUM_OPERAND_TYPES<span class="Delimiter">;</span> ++i<span class="Delimiter">,</span> bitvector >>= <span class="Constant">1</span><span class="Delimiter">,</span> expected >>= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L535" class="LineNr">535 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span> ++i<span class="Delimiter">,</span> bitvector >>= <span class="Constant">1</span><span class="Delimiter">,</span> expected >>= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L536" class="LineNr">536 </span><span class="CommentedCode">//? cerr << "comparing " << HEXBYTE << NUM(bitvector) << " with " << NUM(expected) << '\n';</span> <span id="L537" class="LineNr">537 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector & <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected & <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// all good with this operand</span> -<span id="L538" class="LineNr">538 </span> <span class="Normal">const</span> string& optype = Operand_type_name<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L538" class="LineNr">538 </span> <span class="Normal">const</span> string& optype = <a href='031check_operands.cc.html#L69'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L539" class="LineNr">539 </span> <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector & <span class="Constant">0x1</span><span class="Delimiter">)</span> > <span class="Delimiter">(</span>expected & <span class="Constant">0x1</span><span class="Delimiter">))</span> -<span id="L540" class="LineNr">540 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name_0f<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L540" class="LineNr">540 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L548'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": unexpected "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L541" class="LineNr">541 </span> <span class="Normal">else</span> -<span id="L542" class="LineNr">542 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << maybe_name_0f<span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L542" class="LineNr">542 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << <a href='031check_operands.cc.html#L548'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> << <span class="Constant">": missing "</span> << optype << <span class="Constant">" operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L543" class="LineNr">543 </span> <span class="Comment">// continue giving all errors for a single instruction</span> <span id="L544" class="LineNr">544 </span> <span class="Delimiter">}</span> <span id="L545" class="LineNr">545 </span> <span class="Comment">// ignore settings in any unused bits</span> <span id="L546" class="LineNr">546 </span><span class="Delimiter">}</span> <span id="L547" class="LineNr">547 </span> -<span id="L548" class="LineNr">548 </span>string maybe_name_0f<span class="Delimiter">(</span><span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L548" class="LineNr">548 </span>string <a href='031check_operands.cc.html#L548'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word& op<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L549" class="LineNr">549 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> -<span id="L550" class="LineNr">550 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> +<span id="L550" class="LineNr">550 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">""</span><span class="Delimiter">;</span> <span id="L551" class="LineNr">551 </span> <span class="Comment">// strip stuff in parens from the name</span> -<span id="L552" class="LineNr">552 </span> <span class="Normal">const</span> string& s = get<span class="Delimiter">(</span>Name_0f<span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L552" class="LineNr">552 </span> <span class="Normal">const</span> string& s = get<span class="Delimiter">(</span><a href='010---vm.cc.html#L370'>Name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L553" class="LineNr">553 </span> <span class="Identifier">return</span> <span class="Constant">" ("</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">" ("</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span> <span id="L554" class="LineNr">554 </span><span class="Delimiter">}</span> <span id="L555" class="LineNr">555 </span> -<span id="L556" class="LineNr">556 </span>string tolower<span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L556" class="LineNr">556 </span>string <a href='031check_operands.cc.html#L556'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L557" class="LineNr">557 </span> ostringstream out<span class="Delimiter">;</span> <span id="L558" class="LineNr">558 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span> *s<span class="Delimiter">;</span> ++s<span class="Delimiter">)</span> -<span id="L559" class="LineNr">559 </span> out << <span class="Normal">static_cast</span><<span class="Normal">char</span>><span class="Delimiter">(</span>tolower<span class="Delimiter">(</span>*s<span class="Delimiter">));</span> +<span id="L559" class="LineNr">559 </span> out << <span class="Normal">static_cast</span><<span class="Normal">char</span>><span class="Delimiter">(</span><a href='031check_operands.cc.html#L556'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span> <span id="L560" class="LineNr">560 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L561" class="LineNr">561 </span><span class="Delimiter">}</span> <span id="L562" class="LineNr">562 </span> diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html index bc28c766..9648b995 100644 --- a/html/subx/032check_operand_bounds.cc.html +++ b/html/subx/032check_operand_bounds.cc.html @@ -70,48 +70,48 @@ if ('onhashchange' in window) { <span id="L7" class="LineNr"> 7 </span><span class="traceContains">+error: '4/mod' too large to fit in bitfield mod</span> <span id="L8" class="LineNr"> 8 </span> <span id="L9" class="LineNr"> 9 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L10" class="LineNr">10 </span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>> Operand_bound<span class="Delimiter">;</span> +<span id="L10" class="LineNr">10 </span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>> <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">;</span> <span id="L11" class="LineNr">11 </span><span class="Delimiter">:(before "End One-time Setup")</span> -<span id="L12" class="LineNr">12 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> -<span id="L13" class="LineNr">13 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">2</span><span class="Delimiter">);</span> -<span id="L14" class="LineNr">14 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> -<span id="L15" class="LineNr">15 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> -<span id="L16" class="LineNr">16 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> -<span id="L17" class="LineNr">17 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"scale"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">2</span><span class="Delimiter">);</span> -<span id="L18" class="LineNr">18 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> -<span id="L19" class="LineNr">19 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"disp8"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">8</span><span class="Delimiter">);</span> -<span id="L20" class="LineNr">20 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"disp16"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">16</span><span class="Delimiter">);</span> +<span id="L12" class="LineNr">12 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"subop"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L13" class="LineNr">13 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L14" class="LineNr">14 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"rm32"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L15" class="LineNr">15 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"base"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L16" class="LineNr">16 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"index"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L17" class="LineNr">17 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"scale"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L18" class="LineNr">18 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"r32"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">3</span><span class="Delimiter">);</span> +<span id="L19" class="LineNr">19 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"disp8"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L20" class="LineNr">20 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"disp16"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">16</span><span class="Delimiter">);</span> <span id="L21" class="LineNr">21 </span><span class="Comment">// no bound needed for disp32</span> -<span id="L22" class="LineNr">22 </span>put_new<span class="Delimiter">(</span>Operand_bound<span class="Delimiter">,</span> <span class="Constant">"imm8"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">8</span><span class="Delimiter">);</span> +<span id="L22" class="LineNr">22 </span><a href='001help.cc.html#L253'>put_new</a><span class="Delimiter">(</span><a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">,</span> <span class="Constant">"imm8"</span><span class="Delimiter">,</span> <span class="Constant">1</span><<<span class="Constant">8</span><span class="Delimiter">);</span> <span id="L23" class="LineNr">23 </span><span class="Comment">// no bound needed for imm32</span> <span id="L24" class="LineNr">24 </span> <span id="L25" class="LineNr">25 </span><span class="Delimiter">:(before "Pack Operands(segment code)")</span> <span id="L26" class="LineNr">26 </span>check_operand_bounds<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span> -<span id="L27" class="LineNr">27 </span><span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L27" class="LineNr">27 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L28" class="LineNr">28 </span><span class="Delimiter">:(code)</span> <span id="L29" class="LineNr">29 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L30" class="LineNr">30 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- check operand bounds"</span> << end<span class="Delimiter">();</span> -<span id="L31" class="LineNr">31 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L32" class="LineNr">32 </span> <span class="Normal">const</span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L33" class="LineNr">33 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = first_operand<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> -<span id="L34" class="LineNr">34 </span> check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span> -<span id="L35" class="LineNr">35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// stop at the first mal-formed instruction</span> +<span id="L30" class="LineNr">30 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- check operand bounds"</span> << end<span class="Delimiter">();</span> +<span id="L31" class="LineNr">31 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L32" class="LineNr">32 </span> <span class="Normal">const</span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L33" class="LineNr">33 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L296'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> +<span id="L34" class="LineNr">34 </span> check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span> +<span id="L35" class="LineNr">35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// stop at the first mal-formed instruction</span> <span id="L36" class="LineNr">36 </span> <span class="Delimiter">}</span> <span id="L37" class="LineNr">37 </span><span class="Delimiter">}</span> <span id="L38" class="LineNr">38 </span> <span id="L39" class="LineNr">39 </span><span class="Normal">void</span> check_operand_bounds<span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L40" class="LineNr">40 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>::iterator p = Operand_bound<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Operand_bound<span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L40" class="LineNr">40 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>::iterator p = <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <a href='032check_operand_bounds.cc.html#L10'>Operand_bound</a><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L41" class="LineNr">41 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>w<span class="Delimiter">,</span> p<span class="Delimiter">-></span>first<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L42" class="LineNr">42 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// later transforms are on their own to do their own bounds checking</span> -<span id="L43" class="LineNr">43 </span> <span class="Normal">int32_t</span> x = parse_int<span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L43" class="LineNr">43 </span> <span class="Normal">int32_t</span> x = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L44" class="LineNr">44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x >= <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L45" class="LineNr">45 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Normal">static_cast</span><<span class="Normal">uint32_t</span>><span class="Delimiter">(</span>x<span class="Delimiter">)</span> >= p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> -<span id="L46" class="LineNr">46 </span> raise << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' too large to fit in bitfield "</span> << p<span class="Delimiter">-></span>first << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L46" class="LineNr">46 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' too large to fit in bitfield "</span> << p<span class="Delimiter">-></span>first << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L47" class="LineNr">47 </span> <span class="Delimiter">}</span> <span id="L48" class="LineNr">48 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> <span id="L49" class="LineNr">49 </span> <span class="Comment">// hacky? assuming bound is a power of 2</span> <span id="L50" class="LineNr">50 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>x < -<span class="Constant">1</span>*<span class="Normal">static_cast</span><<span class="Normal">int32_t</span>><span class="Delimiter">(</span>p<span class="Delimiter">-></span>second/<span class="Constant">2</span><span class="Delimiter">))</span> -<span id="L51" class="LineNr">51 </span> raise << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' too large to fit in bitfield "</span> << p<span class="Delimiter">-></span>first << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> +<span id="L51" class="LineNr">51 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << w<span class="Delimiter">.</span>original << <span class="Constant">"' too large to fit in bitfield "</span> << p<span class="Delimiter">-></span>first << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L52" class="LineNr">52 </span> <span class="Delimiter">}</span> <span id="L53" class="LineNr">53 </span> <span class="Delimiter">}</span> <span id="L54" class="LineNr">54 </span><span class="Delimiter">}</span> diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html index d1a500e1..52753bc6 100644 --- a/html/subx/034compute_segment_address.cc.html +++ b/html/subx/034compute_segment_address.cc.html @@ -72,7 +72,7 @@ if ('onhashchange' in window) { <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+load: 0x09000056 -> 0b</span> <span id="L12" class="LineNr"> 12 </span><span class="traceContains">+load: 0x09000057 -> 0c</span> <span id="L13" class="LineNr"> 13 </span><span class="traceContains">+load: 0x09000058 -> 0d</span> -<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to reg EAX</span> +<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span> <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span> <span id="L16" class="LineNr"> 16 </span> <span id="L17" class="LineNr"> 17 </span><span class="Comment">//: Update the parser to handle non-numeric segment name.</span> @@ -82,45 +82,45 @@ if ('onhashchange' in window) { <span id="L21" class="LineNr"> 21 </span><span class="Comment">//: the new data to existing data for the segment.</span> <span id="L22" class="LineNr"> 22 </span> <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L24" class="LineNr"> 24 </span>map<<span class="Comment">/*</span><span class="Comment">name</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Normal">int</span>> Segment_index<span class="Delimiter">;</span> -<span id="L25" class="LineNr"> 25 </span><span class="Normal">bool</span> Currently_parsing_named_segment =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// global to permit cross-layer communication</span> -<span id="L26" class="LineNr"> 26 </span><span class="Normal">int</span> Currently_parsing_segment_index = -<span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// global to permit cross-layer communication</span> +<span id="L24" class="LineNr"> 24 </span>map<<span class="Comment">/*</span><span class="Comment">name</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Normal">int</span>> <a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">;</span> +<span id="L25" class="LineNr"> 25 </span><span class="Normal">bool</span> <a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// global to permit cross-layer communication</span> +<span id="L26" class="LineNr"> 26 </span><span class="Normal">int</span> <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> = -<span class="Constant">1</span><span class="Delimiter">;</span> <span class="Comment">// global to permit cross-layer communication</span> <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L28" class="LineNr"> 28 </span>Segment_index<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L29" class="LineNr"> 29 </span>Currently_parsing_named_segment =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L30" class="LineNr"> 30 </span>Currently_parsing_segment_index = -<span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L28" class="LineNr"> 28 </span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L29" class="LineNr"> 29 </span><a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L30" class="LineNr"> 30 </span><a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> = -<span class="Constant">1</span><span class="Delimiter">;</span> <span id="L31" class="LineNr"> 31 </span> <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">:(before "End Segment Parsing Special-cases(segment_title)")</span> <span id="L33" class="LineNr"> 33 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>segment_title<span class="Delimiter">,</span> <span class="Constant">"0x"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L34" class="LineNr"> 34 </span> Currently_parsing_named_segment =<span class="Constant"> true</span><span class="Delimiter">;</span> -<span id="L35" class="LineNr"> 35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Segment_index<span class="Delimiter">,</span> segment_title<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L36" class="LineNr"> 36 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"new segment '"</span> << segment_title << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L34" class="LineNr"> 34 </span> <a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a> =<span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L35" class="LineNr"> 35 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L36" class="LineNr"> 36 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"new segment '"</span> << segment_title << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L37" class="LineNr"> 37 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>segment_title == <span class="Constant">"code"</span><span class="Delimiter">)</span> -<span id="L38" class="LineNr"> 38 </span> put<span class="Delimiter">(</span>Segment_index<span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L38" class="LineNr"> 38 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> <span id="L39" class="LineNr"> 39 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>segment_title == <span class="Constant">"data"</span><span class="Delimiter">)</span> -<span id="L40" class="LineNr"> 40 </span> put<span class="Delimiter">(</span>Segment_index<span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L40" class="LineNr"> 40 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span> <span id="L41" class="LineNr"> 41 </span> <span class="Normal">else</span> -<span id="L42" class="LineNr"> 42 </span> put<span class="Delimiter">(</span>Segment_index<span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> max<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> SIZE<span class="Delimiter">(</span>out<span class="Delimiter">.</span>segments<span class="Delimiter">)));</span> -<span id="L43" class="LineNr"> 43 </span> out<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>segment<span class="Delimiter">());</span> +<span id="L42" class="LineNr"> 42 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">,</span> max<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">,</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)));</span> +<span id="L43" class="LineNr"> 43 </span> out<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>segment<span class="Delimiter">());</span> <span id="L44" class="LineNr"> 44 </span> <span class="Delimiter">}</span> <span id="L45" class="LineNr"> 45 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L46" class="LineNr"> 46 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"prepending to segment '"</span> << segment_title << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L46" class="LineNr"> 46 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"prepending to segment '"</span> << segment_title << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L47" class="LineNr"> 47 </span> <span class="Delimiter">}</span> -<span id="L48" class="LineNr"> 48 </span> Currently_parsing_segment_index = get<span class="Delimiter">(</span>Segment_index<span class="Delimiter">,</span> segment_title<span class="Delimiter">);</span> +<span id="L48" class="LineNr"> 48 </span> <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> = get<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L24'>Segment_index</a><span class="Delimiter">,</span> segment_title<span class="Delimiter">);</span> <span id="L49" class="LineNr"> 49 </span><span class="Delimiter">}</span> <span id="L50" class="LineNr"> 50 </span> <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(before "End flush(p, lines) Special-cases")</span> -<span id="L52" class="LineNr"> 52 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Currently_parsing_named_segment<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L53" class="LineNr"> 53 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || Currently_parsing_segment_index < <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L54" class="LineNr"> 54 </span> raise << <span class="Constant">"input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L52" class="LineNr"> 52 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L53" class="LineNr"> 53 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">()</span> || <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> < <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L54" class="LineNr"> 54 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"input does not start with a '==' section header</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L55" class="LineNr"> 55 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L56" class="LineNr"> 56 </span> <span class="Delimiter">}</span> -<span id="L57" class="LineNr"> 57 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"flushing to segment"</span> << end<span class="Delimiter">();</span> -<span id="L58" class="LineNr"> 58 </span> vector<line>& curr_segment_data = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>Currently_parsing_segment_index<span class="Delimiter">).</span>lines<span class="Delimiter">;</span> -<span id="L59" class="LineNr"> 59 </span> curr_segment_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr_segment_data<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> lines<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> lines<span class="Delimiter">.</span>end<span class="Delimiter">());</span> -<span id="L60" class="LineNr"> 60 </span> lines<span class="Delimiter">.</span>clear<span class="Delimiter">();</span> -<span id="L61" class="LineNr"> 61 </span> Currently_parsing_named_segment =<span class="Constant"> false</span><span class="Delimiter">;</span> -<span id="L62" class="LineNr"> 62 </span> Currently_parsing_segment_index = -<span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L57" class="LineNr"> 57 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse"</span><span class="Delimiter">)</span> << <span class="Constant">"flushing to segment"</span> << end<span class="Delimiter">();</span> +<span id="L58" class="LineNr"> 58 </span> vector<line>& curr_segment_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span> +<span id="L59" class="LineNr"> 59 </span> curr_segment_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>curr_segment_data<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L60" class="LineNr"> 60 </span> <a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L61" class="LineNr"> 61 </span> <a href='034compute_segment_address.cc.html#L25'>Currently_parsing_named_segment</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> +<span id="L62" class="LineNr"> 62 </span> <a href='034compute_segment_address.cc.html#L26'>Currently_parsing_segment_index</a> = -<span class="Constant">1</span><span class="Delimiter">;</span> <span id="L63" class="LineNr"> 63 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L64" class="LineNr"> 64 </span><span class="Delimiter">}</span> <span id="L65" class="LineNr"> 65 </span> @@ -145,35 +145,35 @@ if ('onhashchange' in window) { <span id="L84" class="LineNr"> 84 </span><span class="Comment">//: compute segment address</span> <span id="L85" class="LineNr"> 85 </span> <span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(before "End Level-2 Transforms")</span> -<span id="L87" class="LineNr"> 87 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>compute_segment_starts<span class="Delimiter">);</span> +<span id="L87" class="LineNr"> 87 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='034compute_segment_address.cc.html#L90'>compute_segment_starts</a><span class="Delimiter">);</span> <span id="L88" class="LineNr"> 88 </span> <span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(code)</span> -<span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> compute_segment_starts<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L91" class="LineNr"> 91 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- compute segment addresses"</span> << end<span class="Delimiter">();</span> -<span id="L92" class="LineNr"> 92 </span> <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span> -<span id="L93" class="LineNr"> 93 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>size<span class="Delimiter">();</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L94" class="LineNr"> 94 </span> segment& curr = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L90" class="LineNr"> 90 </span><span class="Normal">void</span> <a href='034compute_segment_address.cc.html#L90'>compute_segment_starts</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L91" class="LineNr"> 91 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- compute segment addresses"</span> << end<span class="Delimiter">();</span> +<span id="L92" class="LineNr"> 92 </span> <span class="Normal">uint32_t</span> p_offset = <span class="Comment">/*</span><span class="Comment">size of ehdr</span><span class="Comment">*/</span><span class="Constant">0x34</span> + <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span>*<span class="Constant">0x20</span><span class="Comment">/*</span><span class="Comment">size of each phdr</span><span class="Comment">*/</span><span class="Delimiter">;</span> +<span id="L93" class="LineNr"> 93 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L94" class="LineNr"> 94 </span> segment& curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L95" class="LineNr"> 95 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>start == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L96" class="LineNr"> 96 </span> curr<span class="Delimiter">.</span>start = CODE_SEGMENT + i*SPACE_FOR_SEGMENT + p_offset<span class="Delimiter">;</span> -<span id="L97" class="LineNr"> 97 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"segment "</span> << i << <span class="Constant">" begins at address 0x"</span> << HEXWORD << curr<span class="Delimiter">.</span>start << end<span class="Delimiter">();</span> +<span id="L96" class="LineNr"> 96 </span> curr<span class="Delimiter">.</span>start = <a href='012elf.cc.html#L135'>CODE_SEGMENT</a> + i*SPACE_FOR_SEGMENT + p_offset<span class="Delimiter">;</span> +<span id="L97" class="LineNr"> 97 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"segment "</span> << i << <span class="Constant">" begins at address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << curr<span class="Delimiter">.</span>start << end<span class="Delimiter">();</span> <span id="L98" class="LineNr"> 98 </span> <span class="Delimiter">}</span> -<span id="L99" class="LineNr"> 99 </span> p_offset += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> -<span id="L100" class="LineNr">100 </span> assert<span class="Delimiter">(</span>p_offset < INITIAL_SEGMENT_SIZE<span class="Delimiter">);</span> <span class="Comment">// for now we get less and less available space in each successive segment</span> +<span id="L99" class="LineNr"> 99 </span> p_offset += <a href='034compute_segment_address.cc.html#L104'>size_of</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span> +<span id="L100" class="LineNr">100 </span> assert<span class="Delimiter">(</span>p_offset < <a href='010---vm.cc.html#L115'>INITIAL_SEGMENT_SIZE</a><span class="Delimiter">);</span> <span class="Comment">// for now we get less and less available space in each successive segment</span> <span id="L101" class="LineNr">101 </span> <span class="Delimiter">}</span> <span id="L102" class="LineNr">102 </span><span class="Delimiter">}</span> <span id="L103" class="LineNr">103 </span> -<span id="L104" class="LineNr">104 </span><span class="Normal">uint32_t</span> size_of<span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L104" class="LineNr">104 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L104'>size_of</a><span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L105" class="LineNr">105 </span> <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L106" class="LineNr">106 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L107" class="LineNr">107 </span> sum += num_bytes<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L106" class="LineNr">106 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L107" class="LineNr">107 </span> sum += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> <span id="L108" class="LineNr">108 </span> <span class="Identifier">return</span> sum<span class="Delimiter">;</span> <span id="L109" class="LineNr">109 </span><span class="Delimiter">}</span> <span id="L110" class="LineNr">110 </span> <span id="L111" class="LineNr">111 </span><span class="Comment">// Assumes all bitfields are packed.</span> -<span id="L112" class="LineNr">112 </span><span class="Normal">uint32_t</span> num_bytes<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L112" class="LineNr">112 </span><span class="Normal">uint32_t</span> <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L113" class="LineNr">113 </span> <span class="Normal">uint32_t</span> sum = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L114" class="LineNr">114 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L115" class="LineNr">115 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L114" class="LineNr">114 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L115" class="LineNr">115 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L116" class="LineNr">116 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp32"</span><span class="Delimiter">)</span> || has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"imm32"</span><span class="Delimiter">))</span> <span class="Comment">// only multi-byte operands</span> <span id="L117" class="LineNr">117 </span> sum += <span class="Constant">4</span><span class="Delimiter">;</span> <span id="L118" class="LineNr">118 </span> <span class="Comment">// End num_bytes(curr) Special-cases</span> diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html index e306284c..a00b1bc7 100644 --- a/html/subx/035labels.cc.html +++ b/html/subx/035labels.cc.html @@ -82,7 +82,7 @@ if ('onhashchange' in window) { <span id="L20" class="LineNr"> 20 </span><span class="Comment">//: the above rules will remain inviolate.</span> <span id="L21" class="LineNr"> 21 </span> <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before "End looks_like_hex_int(s) Detectors")</span> -<span id="L23" class="LineNr"> 23 </span><span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L23" class="LineNr"> 23 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L24" class="LineNr"> 24 </span> <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(scenarios transform)</span> <span id="L26" class="LineNr"> 26 </span><span class="Delimiter">:(scenario pack_immediate_ignores_single_byte_nondigit_operand)</span> @@ -111,21 +111,21 @@ if ('onhashchange' in window) { <span id="L49" class="LineNr"> 49 </span> <span id="L50" class="LineNr"> 50 </span><span class="Comment">//: a helper we'll find handy later</span> <span id="L51" class="LineNr"> 51 </span><span class="Delimiter">:(code)</span> -<span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> check_valid_name<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L53" class="LineNr"> 53 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L54" class="LineNr"> 54 </span> raise << <span class="Constant">"empty name!</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L54" class="LineNr"> 54 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"empty name!</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L55" class="LineNr"> 55 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L56" class="LineNr"> 56 </span> <span class="Delimiter">}</span> <span id="L57" class="LineNr"> 57 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> == <span class="Constant">'-'</span><span class="Delimiter">)</span> -<span id="L58" class="LineNr"> 58 </span> raise << <span class="Constant">"'"</span> << s << <span class="Constant">"' starts with '-', which can be confused with a negative number; use a different name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L58" class="LineNr"> 58 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << s << <span class="Constant">"' starts with '-', which can be confused with a negative number; use a different name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L59" class="LineNr"> 59 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">)</span> == <span class="Constant">"0x"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L60" class="LineNr"> 60 </span> raise << <span class="Constant">"'"</span> << s << <span class="Constant">"' looks like a hex number; use a different name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L60" class="LineNr"> 60 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << s << <span class="Constant">"' looks like a hex number; use a different name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L61" class="LineNr"> 61 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L62" class="LineNr"> 62 </span> <span class="Delimiter">}</span> <span id="L63" class="LineNr"> 63 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>isdigit<span class="Delimiter">(</span>s<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> -<span id="L64" class="LineNr"> 64 </span> raise << <span class="Constant">"'"</span> << s << <span class="Constant">"' starts with a digit, and so can be confused with a negative number; use a different name.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L65" class="LineNr"> 65 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> -<span id="L66" class="LineNr"> 66 </span> raise << <span class="Constant">"'"</span> << s << <span class="Constant">"' is two characters long which can look like raw hex bytes at a glance; use a different name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L64" class="LineNr"> 64 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << s << <span class="Constant">"' starts with a digit, and so can be confused with a negative number; use a different name.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L65" class="LineNr"> 65 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">)</span> == <span class="Constant">2</span><span class="Delimiter">)</span> +<span id="L66" class="LineNr"> 66 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << s << <span class="Constant">"' is two characters long which can look like raw hex bytes at a glance; use a different name</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L67" class="LineNr"> 67 </span><span class="Delimiter">}</span> <span id="L68" class="LineNr"> 68 </span> <span id="L69" class="LineNr"> 69 </span><span class="Comment">//: Now that that's done, let's start using names as labels.</span> @@ -137,26 +137,26 @@ if ('onhashchange' in window) { <span id="L75" class="LineNr"> 75 </span><span class="traceContains">+transform: label 'loop' is at address 1</span> <span id="L76" class="LineNr"> 76 </span> <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(before "End Level-2 Transforms")</span> -<span id="L78" class="LineNr"> 78 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>rewrite_labels<span class="Delimiter">);</span> +<span id="L78" class="LineNr"> 78 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='035labels.cc.html#L80'>rewrite_labels</a><span class="Delimiter">);</span> <span id="L79" class="LineNr"> 79 </span><span class="Delimiter">:(code)</span> -<span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> rewrite_labels<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L81" class="LineNr"> 81 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- rewrite labels"</span> << end<span class="Delimiter">();</span> -<span id="L82" class="LineNr"> 82 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L83" class="LineNr"> 83 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L80" class="LineNr"> 80 </span><span class="Normal">void</span> <a href='035labels.cc.html#L80'>rewrite_labels</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L81" class="LineNr"> 81 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- rewrite labels"</span> << end<span class="Delimiter">();</span> +<span id="L82" class="LineNr"> 82 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L83" class="LineNr"> 83 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> <span id="L84" class="LineNr"> 84 </span> map<string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>> byte_index<span class="Delimiter">;</span> <span class="Comment">// values are unsigned, but we're going to do subtractions on them so they need to fit in 31 bits</span> -<span id="L85" class="LineNr"> 85 </span> compute_byte_indices_for_labels<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span> -<span id="L86" class="LineNr"> 86 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L87" class="LineNr"> 87 </span> drop_labels<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span> -<span id="L88" class="LineNr"> 88 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L89" class="LineNr"> 89 </span> replace_labels_with_displacements<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span> +<span id="L85" class="LineNr"> 85 </span> <a href='035labels.cc.html#L92'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span> +<span id="L86" class="LineNr"> 86 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L87" class="LineNr"> 87 </span> <a href='035labels.cc.html#L148'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span> +<span id="L88" class="LineNr"> 88 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L89" class="LineNr"> 89 </span> <a href='035labels.cc.html#L160'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span> <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span> <span id="L91" class="LineNr"> 91 </span> -<span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> compute_byte_indices_for_labels<span class="Delimiter">(</span><span class="Normal">const</span> segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> map<string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>>& byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> <a href='035labels.cc.html#L92'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> map<string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>>& byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L93" class="LineNr"> 93 </span> <span class="Normal">int</span> current_byte = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L94" class="LineNr"> 94 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L95" class="LineNr"> 95 </span> <span class="Normal">const</span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L96" class="LineNr"> 96 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L97" class="LineNr"> 97 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L94" class="LineNr"> 94 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L95" class="LineNr"> 95 </span> <span class="Normal">const</span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L96" class="LineNr"> 96 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L97" class="LineNr"> 97 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L98" class="LineNr"> 98 </span> <span class="Comment">// hack: if we have any operand metadata left after previous transforms,</span> <span id="L99" class="LineNr"> 99 </span> <span class="Comment">// deduce its size</span> <span id="L100" class="LineNr">100 </span> <span class="Comment">// Maybe we should just move this transform to before instruction</span> @@ -164,7 +164,7 @@ if ('onhashchange' in window) { <span id="L102" class="LineNr">102 </span> <span class="Comment">// have to deal with bitfields.</span> <span id="L103" class="LineNr">103 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp32"</span><span class="Delimiter">)</span> || has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"imm32"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L104" class="LineNr">104 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">)</span> -<span id="L105" class="LineNr">105 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L105" class="LineNr">105 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': don't use ':' when jumping to labels</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L106" class="LineNr">106 </span> current_byte += <span class="Constant">4</span><span class="Delimiter">;</span> <span id="L107" class="LineNr">107 </span> <span class="Delimiter">}</span> <span id="L108" class="LineNr">108 </span> <span class="Comment">// automatically handle /disp8 and /imm8 here</span> @@ -172,18 +172,18 @@ if ('onhashchange' in window) { <span id="L110" class="LineNr">110 </span> ++current_byte<span class="Delimiter">;</span> <span id="L111" class="LineNr">111 </span> <span class="Delimiter">}</span> <span id="L112" class="LineNr">112 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L113" class="LineNr">113 </span> string label = drop_last<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L113" class="LineNr">113 </span> string label = <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L114" class="LineNr">114 </span> <span class="Comment">// ensure labels look sufficiently different from raw hex</span> -<span id="L115" class="LineNr">115 </span> check_valid_name<span class="Delimiter">(</span>label<span class="Delimiter">);</span> -<span id="L116" class="LineNr">116 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L117" class="LineNr">117 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_any_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> -<span id="L118" class="LineNr">118 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': label definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L115" class="LineNr">115 </span> <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span> +<span id="L116" class="LineNr">116 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L117" class="LineNr">117 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L396'>contains_any_operand_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span> +<span id="L118" class="LineNr">118 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': label definition (':') not allowed in operand</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L119" class="LineNr">119 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>j > <span class="Constant">0</span><span class="Delimiter">)</span> -<span id="L120" class="LineNr">120 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': labels can only be the first word in a line.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L121" class="LineNr">121 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Map_file<span class="Delimiter">.</span>is_open<span class="Delimiter">())</span> -<span id="L122" class="LineNr">122 </span> Map_file << <span class="Constant">"0x"</span> << HEXWORD << <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> << <span class="Constant">' '</span> << label << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L123" class="LineNr">123 </span> put<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span> -<span id="L124" class="LineNr">124 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"label '"</span> << label << <span class="Constant">"' is at address "</span> << <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span>start<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L120" class="LineNr">120 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': labels can only be the first <a href='011run.cc.html#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L121" class="LineNr">121 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span> +<span id="L122" class="LineNr">122 </span> <a href='035labels.cc.html#L133'>Map_file</a> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> << <span class="Constant">' '</span> << label << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L123" class="LineNr">123 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span> +<span id="L124" class="LineNr">124 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"label '"</span> << label << <span class="Constant">"' is at address "</span> << <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span>start<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L125" class="LineNr">125 </span> <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span> <span id="L126" class="LineNr">126 </span> <span class="Delimiter">}</span> <span id="L127" class="LineNr">127 </span> <span class="Delimiter">}</span> @@ -191,53 +191,53 @@ if ('onhashchange' in window) { <span id="L129" class="LineNr">129 </span><span class="Delimiter">}</span> <span id="L130" class="LineNr">130 </span> <span id="L131" class="LineNr">131 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L132" class="LineNr">132 </span><span class="Normal">bool</span> Dump_map =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// currently used only by 'subx translate'</span> -<span id="L133" class="LineNr">133 </span>ofstream Map_file<span class="Delimiter">;</span> +<span id="L132" class="LineNr">132 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L132'>Dump_map</a> =<span class="Constant"> false</span><span class="Delimiter">;</span> <span class="Comment">// currently used only by 'subx translate'</span> +<span id="L133" class="LineNr">133 </span>ofstream <a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">;</span> <span id="L134" class="LineNr">134 </span><span class="Delimiter">:(before "End Commandline Options")</span> -<span id="L135" class="LineNr">135 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_equal<span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--map"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L136" class="LineNr">136 </span> Dump_map =<span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L135" class="LineNr">135 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L89'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">"--map"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L136" class="LineNr">136 </span> <a href='035labels.cc.html#L132'>Dump_map</a> =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L137" class="LineNr">137 </span> <span class="Comment">// End --map Settings</span> <span id="L138" class="LineNr">138 </span><span class="Delimiter">}</span> <span id="L139" class="LineNr">139 </span><span class="Comment">//: wait to open "map" for writing until we're sure we aren't trying to read it</span> <span id="L140" class="LineNr">140 </span><span class="Delimiter">:(after "Begin subx translate")</span> -<span id="L141" class="LineNr">141 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Dump_map<span class="Delimiter">)</span> -<span id="L142" class="LineNr">142 </span> Map_file<span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">"map"</span><span class="Delimiter">);</span> +<span id="L141" class="LineNr">141 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L132'>Dump_map</a><span class="Delimiter">)</span> +<span id="L142" class="LineNr">142 </span> <a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">"map"</span><span class="Delimiter">);</span> <span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before "End subx translate")</span> -<span id="L144" class="LineNr">144 </span><span class="Normal">if</span> <span class="Delimiter">(</span>Dump_map<span class="Delimiter">)</span> -<span id="L145" class="LineNr">145 </span> Map_file<span class="Delimiter">.</span>close<span class="Delimiter">();</span> +<span id="L144" class="LineNr">144 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L132'>Dump_map</a><span class="Delimiter">)</span> +<span id="L145" class="LineNr">145 </span> <a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>close<span class="Delimiter">();</span> <span id="L146" class="LineNr">146 </span> <span id="L147" class="LineNr">147 </span><span class="Delimiter">:(code)</span> -<span id="L148" class="LineNr">148 </span><span class="Normal">void</span> drop_labels<span class="Delimiter">(</span>segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L149" class="LineNr">149 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L150" class="LineNr">150 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L151" class="LineNr">151 </span> vector<word>::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> is_label<span class="Delimiter">);</span> -<span id="L152" class="LineNr">152 </span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L148" class="LineNr">148 </span><span class="Normal">void</span> <a href='035labels.cc.html#L148'>drop_labels</a><span class="Delimiter">(</span>segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L149" class="LineNr">149 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L150" class="LineNr">150 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L151" class="LineNr">151 </span> vector<word>::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L156'>is_label</a><span class="Delimiter">);</span> +<span id="L152" class="LineNr">152 </span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> <span id="L153" class="LineNr">153 </span> <span class="Delimiter">}</span> <span id="L154" class="LineNr">154 </span><span class="Delimiter">}</span> <span id="L155" class="LineNr">155 </span> -<span id="L156" class="LineNr">156 </span><span class="Normal">bool</span> is_label<span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L156" class="LineNr">156 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L156'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L157" class="LineNr">157 </span> <span class="Identifier">return</span> *w<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span> <span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span> <span id="L159" class="LineNr">159 </span> -<span id="L160" class="LineNr">160 </span><span class="Normal">void</span> replace_labels_with_displacements<span class="Delimiter">(</span>segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map<string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>>& byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L160" class="LineNr">160 </span><span class="Normal">void</span> <a href='035labels.cc.html#L160'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment& <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map<string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>>& byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L161" class="LineNr">161 </span> <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span> -<span id="L162" class="LineNr">162 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L163" class="LineNr">163 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L164" class="LineNr">164 </span> byte_index_next_instruction_starts_at += num_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> -<span id="L165" class="LineNr">165 </span> line new_inst<span class="Delimiter">;</span> -<span id="L166" class="LineNr">166 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L167" class="LineNr">167 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> -<span id="L168" class="LineNr">168 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L162" class="LineNr">162 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L163" class="LineNr">163 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L164" class="LineNr">164 </span> byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span> +<span id="L165" class="LineNr">165 </span> <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span> +<span id="L166" class="LineNr">166 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L167" class="LineNr">167 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L168" class="LineNr">168 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L169" class="LineNr">169 </span> <span class="Normal">int32_t</span> displacement = <span class="Normal">static_cast</span><<span class="Normal">int32_t</span>><span class="Delimiter">(</span>get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span> <span id="L170" class="LineNr">170 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp8"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L171" class="LineNr">171 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>displacement > <span class="Constant">0xff</span> || displacement < -<span class="Constant">0x7f</span><span class="Delimiter">)</span> -<span id="L172" class="LineNr">172 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': label too far away for displacement "</span> << std::hex << displacement << <span class="Constant">" to fit in 8 bits</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L172" class="LineNr">172 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': label too far away for displacement "</span> << std::hex << displacement << <span class="Constant">" to fit in 8 bits</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L173" class="LineNr">173 </span> <span class="Normal">else</span> <span id="L174" class="LineNr">174 </span> emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span> <span id="L175" class="LineNr">175 </span> <span class="Delimiter">}</span> <span id="L176" class="LineNr">176 </span> <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp16"</span><span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L177" class="LineNr">177 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>displacement > <span class="Constant">0xffff</span> || displacement < -<span class="Constant">0x7fff</span><span class="Delimiter">)</span> -<span id="L178" class="LineNr">178 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': label too far away for displacement "</span> << std::hex << displacement << <span class="Constant">" to fit in 16 bits</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L178" class="LineNr">178 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': label too far away for displacement "</span> << std::hex << displacement << <span class="Constant">" to fit in 16 bits</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L179" class="LineNr">179 </span> <span class="Normal">else</span> <span id="L180" class="LineNr">180 </span> emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span> <span id="L181" class="LineNr">181 </span> <span class="Delimiter">}</span> @@ -246,24 +246,24 @@ if ('onhashchange' in window) { <span id="L184" class="LineNr">184 </span> <span class="Delimiter">}</span> <span id="L185" class="LineNr">185 </span> <span class="Delimiter">}</span> <span id="L186" class="LineNr">186 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L187" class="LineNr">187 </span> new_inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> +<span id="L187" class="LineNr">187 </span> new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> <span id="L188" class="LineNr">188 </span> <span class="Delimiter">}</span> <span id="L189" class="LineNr">189 </span> <span class="Delimiter">}</span> -<span id="L190" class="LineNr">190 </span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> -<span id="L191" class="LineNr">191 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after transform: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L190" class="LineNr">190 </span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> +<span id="L191" class="LineNr">191 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after <a href='011run.cc.html#L231'>transform</a>: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L192" class="LineNr">192 </span> <span class="Delimiter">}</span> <span id="L193" class="LineNr">193 </span><span class="Delimiter">}</span> <span id="L194" class="LineNr">194 </span> -<span id="L195" class="LineNr">195 </span>string data_to_string<span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L195" class="LineNr">195 </span>string <a href='035labels.cc.html#L195'>data_to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line& inst<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L196" class="LineNr">196 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L197" class="LineNr">197 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L197" class="LineNr">197 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L198" class="LineNr">198 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L199" class="LineNr">199 </span> out << inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span> +<span id="L199" class="LineNr">199 </span> out << inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span> <span id="L200" class="LineNr">200 </span> <span class="Delimiter">}</span> <span id="L201" class="LineNr">201 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span> <span id="L203" class="LineNr">203 </span> -<span id="L204" class="LineNr">204 </span>string drop_last<span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L204" class="LineNr">204 </span>string <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L205" class="LineNr">205 </span> <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span>end<span class="Delimiter">());</span> <span id="L206" class="LineNr">206 </span><span class="Delimiter">}</span> <span id="L207" class="LineNr">207 </span> @@ -290,9 +290,9 @@ if ('onhashchange' in window) { <span id="L228" class="LineNr">228 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span> <span id="L229" class="LineNr">229 </span><span class="traceContains">+transform: label '$loop3' is at address a</span> <span id="L230" class="LineNr">230 </span><span class="Comment"># first jump is to -7</span> -<span id="L231" class="LineNr">231 </span><span class="traceContains">+transform: instruction after transform: 'eb f9'</span> +<span id="L231" class="LineNr">231 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb f9'</span> <span id="L232" class="LineNr">232 </span><span class="Comment"># second jump is to 0 (fall through)</span> -<span id="L233" class="LineNr">233 </span><span class="traceContains">+transform: instruction after transform: 'eb 00'</span> +<span id="L233" class="LineNr">233 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb 00'</span> <span id="L234" class="LineNr">234 </span> <span id="L235" class="LineNr">235 </span><span class="Delimiter">:(scenario label_too_short)</span> <span id="L236" class="LineNr">236 </span><span class="Special">% Hide_errors = true;</span> @@ -328,7 +328,7 @@ if ('onhashchange' in window) { <span id="L266" class="LineNr">266 </span><span class="traceContains">+transform: segment 1 begins at address 0x0a000079</span> <span id="L267" class="LineNr">267 </span> <span id="L268" class="LineNr">268 </span><span class="Delimiter">:(before "End num_bytes(curr) Special-cases")</span> -<span id="L269" class="LineNr">269 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_label<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> +<span id="L269" class="LineNr">269 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L156'>is_label</a><span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span id="L270" class="LineNr">270 </span> <span class="Delimiter">;</span> <span class="Comment">// don't count it</span> </pre> </body> diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html index 23cdd0c0..5d783d16 100644 --- a/html/subx/036global_variables.cc.html +++ b/html/subx/036global_variables.cc.html @@ -79,79 +79,79 @@ if ('onhashchange' in window) { <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+transform: global variable 'x' is at address 0x0a000079</span> <span id="L16" class="LineNr"> 16 </span> <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(before "End Level-2 Transforms")</span> -<span id="L18" class="LineNr"> 18 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>rewrite_global_variables<span class="Delimiter">);</span> +<span id="L18" class="LineNr"> 18 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">);</span> <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(code)</span> -<span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> rewrite_global_variables<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L21" class="LineNr"> 21 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- rewrite global variables"</span> << end<span class="Delimiter">();</span> +<span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L21" class="LineNr"> 21 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- rewrite global variables"</span> << end<span class="Delimiter">();</span> <span id="L22" class="LineNr"> 22 </span> map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>> address<span class="Delimiter">;</span> <span id="L23" class="LineNr"> 23 </span> compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span> -<span id="L24" class="LineNr"> 24 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L25" class="LineNr"> 25 </span> drop_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">);</span> -<span id="L26" class="LineNr"> 26 </span> replace_global_variables_with_addresses<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span> +<span id="L24" class="LineNr"> 24 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L25" class="LineNr"> 25 </span> <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span> +<span id="L26" class="LineNr"> 26 </span> <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span> <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span> <span id="L28" class="LineNr"> 28 </span> <span id="L29" class="LineNr"> 29 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> program& p<span class="Delimiter">,</span> map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>& address<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L30" class="LineNr"> 30 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L31" class="LineNr"> 31 </span> compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span> +<span id="L30" class="LineNr"> 30 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L31" class="LineNr"> 31 </span> compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span> <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span> <span id="L33" class="LineNr"> 33 </span> <span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">,</span> map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>& address<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L35" class="LineNr"> 35 </span> <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span>start<span class="Delimiter">;</span> -<span id="L36" class="LineNr"> 36 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L37" class="LineNr"> 37 </span> <span class="Normal">const</span> line& inst = s<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L38" class="LineNr"> 38 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L39" class="LineNr"> 39 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L36" class="LineNr"> 36 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L37" class="LineNr"> 37 </span> <span class="Normal">const</span> line& inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L38" class="LineNr"> 38 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L39" class="LineNr"> 39 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L40" class="LineNr"> 40 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L41" class="LineNr"> 41 </span> ++current_address<span class="Delimiter">;</span> <span id="L42" class="LineNr"> 42 </span> <span class="Delimiter">}</span> <span id="L43" class="LineNr"> 43 </span> <span class="Normal">else</span> <span class="Delimiter">{</span> -<span id="L44" class="LineNr"> 44 </span> string variable = drop_last<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L44" class="LineNr"> 44 </span> string variable = <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L45" class="LineNr"> 45 </span> <span class="Comment">// ensure variables look sufficiently different from raw hex</span> -<span id="L46" class="LineNr"> 46 </span> check_valid_name<span class="Delimiter">(</span>variable<span class="Delimiter">);</span> -<span id="L47" class="LineNr"> 47 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>trace_contains_errors<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L46" class="LineNr"> 46 </span> <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span> +<span id="L47" class="LineNr"> 47 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L224'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L48" class="LineNr"> 48 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>j > <span class="Constant">0</span><span class="Delimiter">)</span> -<span id="L49" class="LineNr"> 49 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': global variable names can only be the first word in a line.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L50" class="LineNr"> 50 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Map_file<span class="Delimiter">.</span>is_open<span class="Delimiter">())</span> -<span id="L51" class="LineNr"> 51 </span> Map_file << <span class="Constant">"0x"</span> << HEXWORD << current_address << <span class="Constant">' '</span> << variable << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> -<span id="L52" class="LineNr"> 52 </span> put<span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span> -<span id="L53" class="LineNr"> 53 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"global variable '"</span> << variable << <span class="Constant">"' is at address 0x"</span> << HEXWORD << current_address << end<span class="Delimiter">();</span> +<span id="L49" class="LineNr"> 49 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': global variable names can only be the first <a href='011run.cc.html#L123'>word</a> in a line.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L50" class="LineNr"> 50 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L133'>Map_file</a><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span> +<span id="L51" class="LineNr"> 51 </span> <a href='035labels.cc.html#L133'>Map_file</a> << <span class="Constant">"0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << current_address << <span class="Constant">' '</span> << variable << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> +<span id="L52" class="LineNr"> 52 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span> +<span id="L53" class="LineNr"> 53 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"global variable '"</span> << variable << <span class="Constant">"' is at address 0x"</span> << <a href='010---vm.cc.html#L404'>HEXWORD</a> << current_address << end<span class="Delimiter">();</span> <span id="L54" class="LineNr"> 54 </span> <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span> <span id="L55" class="LineNr"> 55 </span> <span class="Delimiter">}</span> <span id="L56" class="LineNr"> 56 </span> <span class="Delimiter">}</span> <span id="L57" class="LineNr"> 57 </span> <span class="Delimiter">}</span> <span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span> <span id="L59" class="LineNr"> 59 </span> -<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> drop_global_variables<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L61" class="LineNr"> 61 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> -<span id="L62" class="LineNr"> 62 </span> drop_labels<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> +<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L61" class="LineNr"> 61 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L62" class="LineNr"> 62 </span> <a href='035labels.cc.html#L148'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span> <span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span> <span id="L64" class="LineNr"> 64 </span> -<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> replace_global_variables_with_addresses<span class="Delimiter">(</span>program& p<span class="Delimiter">,</span> <span class="Normal">const</span> map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>& address<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L66" class="LineNr"> 66 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L67" class="LineNr"> 67 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L68" class="LineNr"> 68 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L69" class="LineNr"> 69 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L70" class="LineNr"> 70 </span> line new_inst<span class="Delimiter">;</span> -<span id="L71" class="LineNr"> 71 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L72" class="LineNr"> 72 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>program& p<span class="Delimiter">,</span> <span class="Normal">const</span> map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>& address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L66" class="LineNr"> 66 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L67" class="LineNr"> 67 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L68" class="LineNr"> 68 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L69" class="LineNr"> 69 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L70" class="LineNr"> 70 </span> <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span> +<span id="L71" class="LineNr"> 71 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L72" class="LineNr"> 72 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L73" class="LineNr"> 73 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L74" class="LineNr"> 74 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> -<span id="L75" class="LineNr"> 75 </span> raise << <span class="Constant">"missing reference to global '"</span> << curr<span class="Delimiter">.</span>data << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L76" class="LineNr"> 76 </span> new_inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> +<span id="L75" class="LineNr"> 75 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"missing reference to global '"</span> << curr<span class="Delimiter">.</span>data << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L76" class="LineNr"> 76 </span> new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span> <span id="L77" class="LineNr"> 77 </span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L78" class="LineNr"> 78 </span> <span class="Delimiter">}</span> <span id="L79" class="LineNr"> 79 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!valid_use_of_global_variable<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L80" class="LineNr"> 80 </span> raise << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': can't refer to global variable '"</span> << curr<span class="Delimiter">.</span>data << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L80" class="LineNr"> 80 </span> <a href='003trace.cc.html#L210'>raise</a> << <span class="Constant">"'"</span> << to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"': can't refer to global variable '"</span> << curr<span class="Delimiter">.</span>data << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> <span id="L81" class="LineNr"> 81 </span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span id="L82" class="LineNr"> 82 </span> <span class="Delimiter">}</span> <span id="L83" class="LineNr"> 83 </span> emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span> <span id="L84" class="LineNr"> 84 </span> <span class="Delimiter">}</span> -<span id="L85" class="LineNr"> 85 </span> inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> -<span id="L86" class="LineNr"> 86 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after transform: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L85" class="LineNr"> 85 </span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> +<span id="L86" class="LineNr"> 86 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after <a href='011run.cc.html#L231'>transform</a>: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L87" class="LineNr"> 87 </span> <span class="Delimiter">}</span> <span id="L88" class="LineNr"> 88 </span><span class="Delimiter">}</span> <span id="L89" class="LineNr"> 89 </span> -<span id="L90" class="LineNr"> 90 </span><span class="Normal">bool</span> valid_use_of_global_variable<span class="Delimiter">(</span><span class="Normal">const</span> word& curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L90" class="LineNr"> 90 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L90'>valid_use_of_global_variable</a><span class="Delimiter">(</span><span class="Normal">const</span> word& curr<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L91" class="LineNr"> 91 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"imm32"</span><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L92" class="LineNr"> 92 </span> <span class="Comment">// End Valid Uses Of Global Variable(curr)</span> <span id="L93" class="LineNr"> 93 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> @@ -161,15 +161,15 @@ if ('onhashchange' in window) { <span id="L97" class="LineNr"> 97 </span><span class="Comment">//: requires first saving some data early before we pack operands</span> <span id="L98" class="LineNr"> 98 </span> <span id="L99" class="LineNr"> 99 </span><span class="Delimiter">:(after "Begin Level-2 Transforms")</span> -<span id="L100" class="LineNr">100 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>correlate_disp32_with_mod<span class="Delimiter">);</span> +<span id="L100" class="LineNr">100 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L102'>correlate_disp32_with_mod</a><span class="Delimiter">);</span> <span id="L101" class="LineNr">101 </span><span class="Delimiter">:(code)</span> -<span id="L102" class="LineNr">102 </span><span class="Normal">void</span> correlate_disp32_with_mod<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L103" class="LineNr">103 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L104" class="LineNr">104 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L105" class="LineNr">105 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L106" class="LineNr">106 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L107" class="LineNr">107 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L108" class="LineNr">108 </span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L102" class="LineNr">102 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L102'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L103" class="LineNr">103 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L104" class="LineNr">104 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L105" class="LineNr">105 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L106" class="LineNr">106 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L107" class="LineNr">107 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L108" class="LineNr">108 </span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L109" class="LineNr">109 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp32"</span><span class="Delimiter">)</span> <span id="L110" class="LineNr">110 </span> && has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">"mod"</span><span class="Delimiter">))</span> <span id="L111" class="LineNr">111 </span> curr<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">"has_mod"</span><span class="Delimiter">);</span> @@ -179,13 +179,13 @@ if ('onhashchange' in window) { <span id="L115" class="LineNr">115 </span> <span id="L116" class="LineNr">116 </span><span class="Delimiter">:(before "End Valid Uses Of Global Variable(curr)")</span> <span id="L117" class="LineNr">117 </span><span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"disp32"</span><span class="Delimiter">))</span> -<span id="L118" class="LineNr">118 </span> <span class="Identifier">return</span> has_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"has_mod"</span><span class="Delimiter">);</span> +<span id="L118" class="LineNr">118 </span> <span class="Identifier">return</span> <a href='036global_variables.cc.html#L123'>has_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">"has_mod"</span><span class="Delimiter">);</span> <span id="L119" class="LineNr">119 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span> <span id="L120" class="LineNr">120 </span><span class="Comment">// addresses as a real displacement added to other operands.</span> <span id="L121" class="LineNr">121 </span> <span id="L122" class="LineNr">122 </span><span class="Delimiter">:(code)</span> -<span id="L123" class="LineNr">123 </span><span class="Normal">bool</span> has_metadata<span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">,</span> <span class="Normal">const</span> string& m<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L124" class="LineNr">124 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> +<span id="L123" class="LineNr">123 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L123'>has_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word& w<span class="Delimiter">,</span> <span class="Normal">const</span> string& m<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L124" class="LineNr">124 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span id="L125" class="LineNr">125 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == m<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L126" class="LineNr">126 </span> <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span> <span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span> @@ -214,7 +214,7 @@ if ('onhashchange' in window) { <span id="L150" class="LineNr">150 </span> <span id="L151" class="LineNr">151 </span><span class="Delimiter">:(scenario disp32_data_with_modrm)</span> <span id="L152" class="LineNr">152 </span>== <a href='031check_operands.cc.html#L11'>code</a> -<span id="L153" class="LineNr">153 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span><a href='subx.cc.html#L8324'>disp32</a> <span class="Constant">2</span>/r32/EDX x/disp32 +<span id="L153" class="LineNr">153 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX x/disp32 <span id="L154" class="LineNr">154 </span>== data <span id="L155" class="LineNr">155 </span><span class="Normal">x</span>: <span id="L156" class="LineNr">156 </span><span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> @@ -229,13 +229,13 @@ if ('onhashchange' in window) { <span id="L165" class="LineNr">165 </span>$error: <span class="Constant">0</span> <span id="L166" class="LineNr">166 </span> <span id="L167" class="LineNr">167 </span><span class="Delimiter">:(code)</span> -<span id="L168" class="LineNr">168 </span>string <a href='subx.cc.html#L7929'>to_full_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L168" class="LineNr">168 </span>string to_full_string<span class="Delimiter">(</span><span class="Normal">const</span> line& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L169" class="LineNr">169 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L170" class="LineNr">170 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L170" class="LineNr">170 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L171" class="LineNr">171 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>i > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L172" class="LineNr">172 </span> out << in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span> -<span id="L173" class="LineNr">173 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> -<span id="L174" class="LineNr">174 </span> out << <span class="Constant">'/'</span> << in<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L172" class="LineNr">172 </span> out << in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span> +<span id="L173" class="LineNr">173 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> +<span id="L174" class="LineNr">174 </span> out << <span class="Constant">'/'</span> << in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L175" class="LineNr">175 </span> <span class="Delimiter">}</span> <span id="L176" class="LineNr">176 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L177" class="LineNr">177 </span><span class="Delimiter">}</span> diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html index 63cdd287..479e1731 100644 --- a/html/subx/038---literal_strings.cc.html +++ b/html/subx/038---literal_strings.cc.html @@ -70,68 +70,68 @@ if ('onhashchange' in window) { <span id="L9" class="LineNr"> 9 </span>== data <span class="Comment"># need to manually create this for now</span> <span id="L10" class="LineNr"> 10 </span><span class="traceContains">+transform: -- move literal strings to data segment</span> <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+transform: adding global variable '__subx_global_1' containing "test"</span> -<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: instruction after transform: 'b8 __subx_global_1'</span> +<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'b8 __subx_global_1'</span> <span id="L13" class="LineNr"> 13 </span> <span id="L14" class="LineNr"> 14 </span><span class="Comment">//: We don't rely on any transforms running in previous layers, but this layer</span> <span id="L15" class="LineNr"> 15 </span><span class="Comment">//: knows about labels and global variables and will emit them for previous</span> <span id="L16" class="LineNr"> 16 </span><span class="Comment">//: layers to transform.</span> <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">:(after "Begin Transforms")</span> <span id="L18" class="LineNr"> 18 </span><span class="Comment">// Begin Level-3 Transforms</span> -<span id="L19" class="LineNr"> 19 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>transform_literal_strings<span class="Delimiter">);</span> +<span id="L19" class="LineNr"> 19 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">);</span> <span id="L20" class="LineNr"> 20 </span><span class="Comment">// End Level-3 Transforms</span> <span id="L21" class="LineNr"> 21 </span> <span id="L22" class="LineNr"> 22 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L23" class="LineNr"> 23 </span><span class="Normal">int</span> Next_auto_global = <span class="Constant">1</span><span class="Delimiter">;</span> +<span id="L23" class="LineNr"> 23 </span><span class="Normal">int</span> <a href='038---literal_strings.cc.html#L23'>Next_auto_global</a> = <span class="Constant">1</span><span class="Delimiter">;</span> <span id="L24" class="LineNr"> 24 </span><span class="Delimiter">:(code)</span> -<span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> transform_literal_strings<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L26" class="LineNr"> 26 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- move literal strings to data segment"</span> << end<span class="Delimiter">();</span> -<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L28" class="LineNr"> 28 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L25" class="LineNr"> 25 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L25'>transform_literal_strings</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L26" class="LineNr"> 26 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- move literal strings to data segment"</span> << end<span class="Delimiter">();</span> +<span id="L27" class="LineNr"> 27 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L28" class="LineNr"> 28 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> <span id="L29" class="LineNr"> 29 </span> segment data<span class="Delimiter">;</span> -<span id="L30" class="LineNr"> 30 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L31" class="LineNr"> 31 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L32" class="LineNr"> 32 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L33" class="LineNr"> 33 </span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L30" class="LineNr"> 30 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L31" class="LineNr"> 31 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L32" class="LineNr"> 32 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L33" class="LineNr"> 33 </span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L34" class="LineNr"> 34 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> != <span class="Constant">'"'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L35" class="LineNr"> 35 </span> ostringstream global_name<span class="Delimiter">;</span> -<span id="L36" class="LineNr"> 36 </span> global_name << <span class="Constant">"__subx_global_"</span> << Next_auto_global<span class="Delimiter">;</span> +<span id="L36" class="LineNr"> 36 </span> global_name << <span class="Constant">"__subx_global_"</span> << <a href='038---literal_strings.cc.html#L23'>Next_auto_global</a><span class="Delimiter">;</span> <span id="L37" class="LineNr"> 37 </span> ++Next_auto_global<span class="Delimiter">;</span> -<span id="L38" class="LineNr"> 38 </span> add_global_to_data_segment<span class="Delimiter">(</span>global_name<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> curr<span class="Delimiter">,</span> data<span class="Delimiter">);</span> +<span id="L38" class="LineNr"> 38 </span> <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span>global_name<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> curr<span class="Delimiter">,</span> data<span class="Delimiter">);</span> <span id="L39" class="LineNr"> 39 </span> curr<span class="Delimiter">.</span>data = global_name<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L40" class="LineNr"> 40 </span> <span class="Delimiter">}</span> -<span id="L41" class="LineNr"> 41 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after transform: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> +<span id="L41" class="LineNr"> 41 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"instruction after <a href='011run.cc.html#L231'>transform</a>: '"</span> << data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'"</span> << end<span class="Delimiter">();</span> <span id="L42" class="LineNr"> 42 </span> <span class="Delimiter">}</span> -<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>SIZE<span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">)</span> < <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L45" class="LineNr"> 45 </span> p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span> -<span id="L46" class="LineNr"> 46 </span> p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>lines<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> +<span id="L43" class="LineNr"> 43 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L44" class="LineNr"> 44 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span> < <span class="Constant">2</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L45" class="LineNr"> 45 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span> +<span id="L46" class="LineNr"> 46 </span> p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> <span id="L47" class="LineNr"> 47 </span> <span class="Delimiter">}</span> -<span id="L48" class="LineNr"> 48 </span> vector<line>& existing_data = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>lines<span class="Delimiter">;</span> -<span id="L49" class="LineNr"> 49 </span> existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L48" class="LineNr"> 48 </span> vector<line>& existing_data = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">;</span> +<span id="L49" class="LineNr"> 49 </span> existing_data<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>existing_data<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> <span id="L50" class="LineNr"> 50 </span><span class="Delimiter">}</span> <span id="L51" class="LineNr"> 51 </span> -<span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> add_global_to_data_segment<span class="Delimiter">(</span><span class="Normal">const</span> string& name<span class="Delimiter">,</span> <span class="Normal">const</span> word& value<span class="Delimiter">,</span> segment& data<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L53" class="LineNr"> 53 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"adding global variable '"</span> << name << <span class="Constant">"' containing "</span> << value<span class="Delimiter">.</span>data << end<span class="Delimiter">();</span> +<span id="L52" class="LineNr"> 52 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L52'>add_global_to_data_segment</a><span class="Delimiter">(</span><span class="Normal">const</span> string& name<span class="Delimiter">,</span> <span class="Normal">const</span> word& value<span class="Delimiter">,</span> segment& data<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L53" class="LineNr"> 53 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"adding global variable '"</span> << name << <span class="Constant">"' containing "</span> << value<span class="Delimiter">.</span>data << end<span class="Delimiter">();</span> <span id="L54" class="LineNr"> 54 </span> <span class="Comment">// emit label</span> -<span id="L55" class="LineNr"> 55 </span> data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span> +<span id="L55" class="LineNr"> 55 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span>name<span class="Delimiter">));</span> <span id="L56" class="LineNr"> 56 </span> <span class="Comment">// emit size for size-prefixed array</span> -<span id="L57" class="LineNr"> 57 </span> data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>line<span class="Delimiter">());</span> -<span id="L58" class="LineNr"> 58 </span> emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>back<span class="Delimiter">(),</span> SIZE<span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span> +<span id="L57" class="LineNr"> 57 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">());</span> +<span id="L58" class="LineNr"> 58 </span> emit_hex_bytes<span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">(),</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip quotes</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Comment">/*</span><span class="Comment">bytes</span><span class="Comment">*/</span><span class="Delimiter">);</span> <span id="L59" class="LineNr"> 59 </span> <span class="Comment">// emit data byte by byte</span> -<span id="L60" class="LineNr"> 60 </span> data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>line<span class="Delimiter">());</span> -<span id="L61" class="LineNr"> 61 </span> line& curr = data<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>back<span class="Delimiter">();</span> -<span id="L62" class="LineNr"> 62 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip start quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L60" class="LineNr"> 60 </span> data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L117'>line</a><span class="Delimiter">());</span> +<span id="L61" class="LineNr"> 61 </span> line& curr = data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>back<span class="Delimiter">();</span> +<span id="L62" class="LineNr"> 62 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip start quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>value<span class="Delimiter">.</span>data<span class="Delimiter">)</span>-<span class="Comment">/*</span><span class="Comment">skip end quote</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L63" class="LineNr"> 63 </span> <span class="Normal">char</span> c = value<span class="Delimiter">.</span>data<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L64" class="LineNr"> 64 </span> curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">());</span> -<span id="L65" class="LineNr"> 65 </span> curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = hex_byte_to_string<span class="Delimiter">(</span>c<span class="Delimiter">);</span> -<span id="L66" class="LineNr"> 66 </span> curr<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span> +<span id="L64" class="LineNr"> 64 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> +<span id="L65" class="LineNr"> 65 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <a href='030---operands.cc.html#L286'>hex_byte_to_string</a><span class="Delimiter">(</span>c<span class="Delimiter">);</span> +<span id="L66" class="LineNr"> 66 </span> curr<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>string<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">,</span> c<span class="Delimiter">));</span> <span id="L67" class="LineNr"> 67 </span> <span class="Delimiter">}</span> <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span> <span id="L69" class="LineNr"> 69 </span> -<span id="L70" class="LineNr"> 70 </span>line label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L71" class="LineNr"> 71 </span> line result<span class="Delimiter">;</span> -<span id="L72" class="LineNr"> 72 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">());</span> -<span id="L73" class="LineNr"> 73 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Delimiter">(</span>s+<span class="Constant">":"</span><span class="Delimiter">);</span> +<span id="L70" class="LineNr"> 70 </span><a href='011run.cc.html#L117'>line</a> label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L71" class="LineNr"> 71 </span> <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span> +<span id="L72" class="LineNr"> 72 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> +<span id="L73" class="LineNr"> 73 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Delimiter">(</span>s+<span class="Constant">":"</span><span class="Delimiter">);</span> <span id="L74" class="LineNr"> 74 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span> <span id="L76" class="LineNr"> 76 </span> @@ -141,9 +141,9 @@ if ('onhashchange' in window) { <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(scenarios parse_instruction_character_by_character)</span> <span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenario instruction_with_string_literal)</span> <span id="L82" class="LineNr"> 82 </span>a <span class="Constant">"abc def"</span> z <span class="Comment"># two spaces inside string</span> -<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+parse2: word: a</span> -<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+parse2: word: "abc def"</span> -<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+parse2: word: z</span> +<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "abc def"</span> +<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span> <span id="L86" class="LineNr"> 86 </span><span class="Comment"># no other words</span> <span id="L87" class="LineNr"> 87 </span>$parse2: <span class="Constant">3</span> <span id="L88" class="LineNr"> 88 </span> @@ -158,10 +158,10 @@ if ('onhashchange' in window) { <span id="L97" class="LineNr"> 97 </span> <span class="Comment">// parse literals</span> <span id="L98" class="LineNr"> 98 </span> istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span> <span id="L99" class="LineNr"> 99 </span> in >> std::noskipws<span class="Delimiter">;</span> -<span id="L100" class="LineNr">100 </span> line result<span class="Delimiter">;</span> +<span id="L100" class="LineNr">100 </span> <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span> <span id="L101" class="LineNr">101 </span> <span class="Comment">// add tokens (words or strings) one by one</span> -<span id="L102" class="LineNr">102 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L103" class="LineNr">103 </span> skip_whitespace<span class="Delimiter">(</span>in<span class="Delimiter">);</span> +<span id="L102" class="LineNr">102 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L103" class="LineNr">103 </span> <a href='038---literal_strings.cc.html#L136'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L104" class="LineNr">104 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L105" class="LineNr">105 </span> <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> <span id="L106" class="LineNr">106 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span class="Comment">// comment; drop rest of line</span> @@ -175,36 +175,36 @@ if ('onhashchange' in window) { <span id="L114" class="LineNr">114 </span> w << c<span class="Delimiter">;</span> <span id="L115" class="LineNr">115 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'"'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L116" class="LineNr">116 </span> <span class="Comment">// slurp until '"'</span> -<span id="L117" class="LineNr">117 </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="L117" class="LineNr">117 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L118" class="LineNr">118 </span> in >> c<span class="Delimiter">;</span> <span id="L119" class="LineNr">119 </span> w << c<span class="Delimiter">;</span> <span id="L120" class="LineNr">120 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'"'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L121" class="LineNr">121 </span> <span class="Delimiter">}</span> <span id="L122" class="LineNr">122 </span> <span class="Delimiter">}</span> <span id="L123" class="LineNr">123 </span> <span class="Comment">// slurp any remaining characters until whitespace</span> -<span id="L124" class="LineNr">124 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> && has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span class="Comment">// peek can sometimes trigger eof(), so do it first</span> +<span id="L124" class="LineNr">124 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> && <a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span class="Comment">// peek can sometimes trigger eof(), so do it first</span> <span id="L125" class="LineNr">125 </span> in >> c<span class="Delimiter">;</span> <span id="L126" class="LineNr">126 </span> w << c<span class="Delimiter">;</span> <span id="L127" class="LineNr">127 </span> <span class="Delimiter">}</span> -<span id="L128" class="LineNr">128 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">());</span> -<span id="L129" class="LineNr">129 </span> parse_word<span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">());</span> -<span id="L130" class="LineNr">130 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse2"</span><span class="Delimiter">)</span> << <span class="Constant">"word: "</span> << to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">())</span> << end<span class="Delimiter">();</span> +<span id="L128" class="LineNr">128 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> +<span id="L129" class="LineNr">129 </span> <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span> +<span id="L130" class="LineNr">130 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"parse2"</span><span class="Delimiter">)</span> << <span class="Constant">"word: "</span> << to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> << end<span class="Delimiter">();</span> <span id="L131" class="LineNr">131 </span> <span class="Delimiter">}</span> -<span id="L132" class="LineNr">132 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> +<span id="L132" class="LineNr">132 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span id="L133" class="LineNr">133 </span> out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span> <span id="L134" class="LineNr">134 </span><span class="Delimiter">}</span> <span id="L135" class="LineNr">135 </span> -<span id="L136" class="LineNr">136 </span><span class="Normal">void</span> skip_whitespace<span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L136" class="LineNr">136 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L136'>skip_whitespace</a><span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L137" class="LineNr">137 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L138" class="LineNr">138 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> && isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> +<span id="L138" class="LineNr">138 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> && isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> <span id="L139" class="LineNr">139 </span> <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L140" class="LineNr">140 </span> <span class="Delimiter">}</span> <span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span> <span id="L142" class="LineNr">142 </span> -<span id="L143" class="LineNr">143 </span><span class="Normal">void</span> skip_comment<span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L144" class="LineNr">144 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> && in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L143" class="LineNr">143 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L143'>skip_comment</a><span class="Delimiter">(</span>istream& in<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L144" class="LineNr">144 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> && in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L145" class="LineNr">145 </span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> -<span id="L146" class="LineNr">146 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>in<span class="Delimiter">)</span> && in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> +<span id="L146" class="LineNr">146 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> && in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span> <span id="L147" class="LineNr">147 </span> <span class="Delimiter">}</span> <span id="L148" class="LineNr">148 </span><span class="Delimiter">}</span> <span id="L149" class="LineNr">149 </span> @@ -216,61 +216,61 @@ if ('onhashchange' in window) { <span id="L155" class="LineNr">155 </span> <span id="L156" class="LineNr">156 </span><span class="Delimiter">:(scenario parse2_comment_token_in_middle)</span> <span id="L157" class="LineNr">157 </span>a <span class="Delimiter">.</span> z -<span id="L158" class="LineNr">158 </span><span class="traceContains">+parse2: word: a</span> -<span id="L159" class="LineNr">159 </span><span class="traceContains">+parse2: word: z</span> -<span id="L160" class="LineNr">160 </span><span class="traceAbsent">-parse2: word: .</span> +<span id="L158" class="LineNr">158 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L159" class="LineNr">159 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span> +<span id="L160" class="LineNr">160 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span> <span id="L161" class="LineNr">161 </span><span class="Comment"># no other words</span> <span id="L162" class="LineNr">162 </span>$parse2: <span class="Constant">2</span> <span id="L163" class="LineNr">163 </span> <span id="L164" class="LineNr">164 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot)</span> <span id="L165" class="LineNr">165 </span>a <span class="Delimiter">.</span>b c -<span id="L166" class="LineNr">166 </span><span class="traceContains">+parse2: word: a</span> -<span id="L167" class="LineNr">167 </span><span class="traceContains">+parse2: word: .b</span> -<span id="L168" class="LineNr">168 </span><span class="traceContains">+parse2: word: c</span> +<span id="L166" class="LineNr">166 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L167" class="LineNr">167 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .b</span> +<span id="L168" class="LineNr">168 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span> <span id="L169" class="LineNr">169 </span> <span id="L170" class="LineNr">170 </span><span class="Delimiter">:(scenario parse2_comment_token_at_start)</span> <span id="L171" class="LineNr">171 </span><span class="Delimiter">.</span> a b -<span id="L172" class="LineNr">172 </span><span class="traceContains">+parse2: word: a</span> -<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: word: b</span> -<span id="L174" class="LineNr">174 </span><span class="traceAbsent">-parse2: word: .</span> +<span id="L172" class="LineNr">172 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span> +<span id="L174" class="LineNr">174 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span> <span id="L175" class="LineNr">175 </span> <span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario parse2_comment_token_at_end)</span> <span id="L177" class="LineNr">177 </span>a b <span class="Delimiter">.</span> -<span id="L178" class="LineNr">178 </span><span class="traceContains">+parse2: word: a</span> -<span id="L179" class="LineNr">179 </span><span class="traceContains">+parse2: word: b</span> -<span id="L180" class="LineNr">180 </span><span class="traceAbsent">-parse2: word: .</span> +<span id="L178" class="LineNr">178 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L179" class="LineNr">179 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span> +<span id="L180" class="LineNr">180 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span> <span id="L181" class="LineNr">181 </span> <span id="L182" class="LineNr">182 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot_at_start)</span> <span id="L183" class="LineNr">183 </span><span class="Delimiter">.</span>a b c -<span id="L184" class="LineNr">184 </span><span class="traceContains">+parse2: word: .a</span> -<span id="L185" class="LineNr">185 </span><span class="traceContains">+parse2: word: b</span> -<span id="L186" class="LineNr">186 </span><span class="traceContains">+parse2: word: c</span> +<span id="L184" class="LineNr">184 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span> +<span id="L185" class="LineNr">185 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span> +<span id="L186" class="LineNr">186 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span> <span id="L187" class="LineNr">187 </span> <span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario parse2_metadata)</span> <span id="L189" class="LineNr">189 </span><span class="Delimiter">.</span>a b/c d -<span id="L190" class="LineNr">190 </span><span class="traceContains">+parse2: word: .a</span> -<span id="L191" class="LineNr">191 </span><span class="traceContains">+parse2: word: b /c</span> -<span id="L192" class="LineNr">192 </span><span class="traceContains">+parse2: word: d</span> +<span id="L190" class="LineNr">190 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span> +<span id="L191" class="LineNr">191 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b /c</span> +<span id="L192" class="LineNr">192 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: d</span> <span id="L193" class="LineNr">193 </span> <span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario parse2_string_with_metadata)</span> <span id="L195" class="LineNr">195 </span>a <span class="Constant">"bc def"</span>/disp32 g -<span id="L196" class="LineNr">196 </span><span class="traceContains">+parse2: word: a</span> -<span id="L197" class="LineNr">197 </span><span class="traceContains">+parse2: word: "bc def" /disp32</span> -<span id="L198" class="LineNr">198 </span><span class="traceContains">+parse2: word: g</span> +<span id="L196" class="LineNr">196 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L197" class="LineNr">197 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "bc def" /disp32</span> +<span id="L198" class="LineNr">198 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: g</span> <span id="L199" class="LineNr">199 </span> <span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario parse2_string_with_metadata_at_end)</span> <span id="L201" class="LineNr">201 </span>a <span class="Constant">"bc def"</span>/disp32 -<span id="L202" class="LineNr">202 </span><span class="traceContains">+parse2: word: a</span> -<span id="L203" class="LineNr">203 </span><span class="traceContains">+parse2: word: "bc def" /disp32</span> +<span id="L202" class="LineNr">202 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span> +<span id="L203" class="LineNr">203 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: "bc def" /disp32</span> <span id="L204" class="LineNr">204 </span> <span id="L205" class="LineNr">205 </span><span class="Delimiter">:(code)</span> -<span id="L206" class="LineNr">206 </span><span class="Normal">void</span> test_parse2_string_with_metadata_at_end_of_line_without_newline<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L206" class="LineNr">206 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L206'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L207" class="LineNr">207 </span> parse_instruction_character_by_character<span class="Delimiter">(</span> <span id="L208" class="LineNr">208 </span> <span class="Constant">"68/push </span><span class="cSpecial">\"</span><span class="Constant">test</span><span class="cSpecial">\"</span><span class="Constant">/f"</span> <span class="Comment">// no newline, which is how calls from parse() will look</span> <span id="L209" class="LineNr">209 </span> <span class="Delimiter">);</span> -<span id="L210" class="LineNr">210 </span> CHECK_TRACE_CONTENTS<span class="Delimiter">(</span> -<span id="L211" class="LineNr">211 </span> <span class="Constant">"parse2: word: 68 /push^D"</span> -<span id="L212" class="LineNr">212 </span> <span class="Constant">"parse2: word: </span><span class="cSpecial">\"</span><span class="Constant">test</span><span class="cSpecial">\"</span><span class="Constant"> /f^D"</span> +<span id="L210" class="LineNr">210 </span> <a href='003trace.cc.html#L257'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span> +<span id="L211" class="LineNr">211 </span> <span class="Constant">"parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D"</span> +<span id="L212" class="LineNr">212 </span> <span class="Constant">"parse2: <a href='011run.cc.html#L123'>word</a>: </span><span class="cSpecial">\"</span><span class="Constant">test</span><span class="cSpecial">\"</span><span class="Constant"> /f^D"</span> <span id="L213" class="LineNr">213 </span> <span class="Delimiter">);</span> <span id="L214" class="LineNr">214 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html index e3087006..9cf21c15 100644 --- a/html/subx/039debug.cc.html +++ b/html/subx/039debug.cc.html @@ -61,25 +61,25 @@ if ('onhashchange' in window) { <span id="L4" class="LineNr"> 4 </span><span class="Comment">// (It'll only affect the trace.)</span> <span id="L5" class="LineNr"> 5 </span> <span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L7" class="LineNr"> 7 </span>map<<span class="Comment">/*</span><span class="Comment">address</span><span class="Comment">*/</span><span class="Normal">uint32_t</span><span class="Delimiter">,</span> string> Symbol_name<span class="Delimiter">;</span> <span class="Comment">// used only by 'subx run'</span> +<span id="L7" class="LineNr"> 7 </span>map<<span class="Comment">/*</span><span class="Comment">address</span><span class="Comment">*/</span><span class="Normal">uint32_t</span><span class="Delimiter">,</span> string> <a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">;</span> <span class="Comment">// used only by 'subx run'</span> <span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(before "End --map Settings")</span> -<span id="L9" class="LineNr"> 9 </span>load_map<span class="Delimiter">(</span><span class="Constant">"map"</span><span class="Delimiter">);</span> +<span id="L9" class="LineNr"> 9 </span><a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Constant">"map"</span><span class="Delimiter">);</span> <span id="L10" class="LineNr">10 </span><span class="Delimiter">:(code)</span> -<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> load_map<span class="Delimiter">(</span><span class="Normal">const</span> string& map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> <a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Normal">const</span> string& map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L12" class="LineNr">12 </span> ifstream fin<span class="Delimiter">(</span>map_filename<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span> <span id="L13" class="LineNr">13 </span> fin >> std::hex<span class="Delimiter">;</span> -<span id="L14" class="LineNr">14 </span> <span class="Normal">while</span> <span class="Delimiter">(</span>has_data<span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L14" class="LineNr">14 </span> <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L265'>has_data</a><span class="Delimiter">(</span>fin<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L15" class="LineNr">15 </span> <span class="Normal">uint32_t</span> addr = <span class="Constant">0</span><span class="Delimiter">;</span> <span id="L16" class="LineNr">16 </span> fin >> addr<span class="Delimiter">;</span> <span id="L17" class="LineNr">17 </span> string name<span class="Delimiter">;</span> <span id="L18" class="LineNr">18 </span> fin >> name<span class="Delimiter">;</span> -<span id="L19" class="LineNr">19 </span> put<span class="Delimiter">(</span>Symbol_name<span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span> +<span id="L19" class="LineNr">19 </span> <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span> <span id="L20" class="LineNr">20 </span> <span class="Delimiter">}</span> <span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span> <span id="L22" class="LineNr">22 </span> <span id="L23" class="LineNr">23 </span><span class="Delimiter">:(after "Run One Instruction")</span> -<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span>Symbol_name<span class="Delimiter">,</span> EIP<span class="Delimiter">))</span> -<span id="L25" class="LineNr">25 </span> trace<span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"== label "</span> << get<span class="Delimiter">(</span>Symbol_name<span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L24" class="LineNr">24 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L247'>contains_key</a><span class="Delimiter">(</span><a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">))</span> +<span id="L25" class="LineNr">25 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">"run"</span><span class="Delimiter">)</span> << <span class="Constant">"== label "</span> << get<span class="Delimiter">(</span><a href='039debug.cc.html#L7'>Symbol_name</a><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> << end<span class="Delimiter">();</span> </pre> </body> </html> diff --git a/html/subx/040---tests.cc.html b/html/subx/040---tests.cc.html index f1702142..a37c0e15 100644 --- a/html/subx/040---tests.cc.html +++ b/html/subx/040---tests.cc.html @@ -73,13 +73,13 @@ if ('onhashchange' in window) { <span id="L11" class="LineNr">11 </span><span class="Comment">//: knows about labels and will emit labels for previous layers to transform.</span> <span id="L12" class="LineNr">12 </span><span class="Delimiter">:(after "Begin Transforms")</span> <span id="L13" class="LineNr">13 </span><span class="Comment">// Begin Level-4 Transforms</span> -<span id="L14" class="LineNr">14 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='subx.cc.html#L8276'>create_test_function</a><span class="Delimiter">);</span> +<span id="L14" class="LineNr">14 </span><a href='011run.cc.html#L229'>Transform</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>create_test_function<span class="Delimiter">);</span> <span id="L15" class="LineNr">15 </span><span class="Comment">// End Level-4 Transforms</span> <span id="L16" class="LineNr">16 </span> <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(scenario run_test)</span> <span id="L18" class="LineNr">18 </span><span class="Special">% Reg[ESP].u = 0x100;</span> <span id="L19" class="LineNr">19 </span>== <span class="Constant">0x1</span> -<span id="L20" class="LineNr">20 </span><span class="Normal">main</span>: +<span id="L20" class="LineNr">20 </span><span class="Normal"><a href='000organization.cc.html#L113'>main</a></span>: <span id="L21" class="LineNr">21 </span> e8/call run-tests/disp32 <span class="Comment"># 5 bytes</span> <span id="L22" class="LineNr">22 </span> f4/halt <span class="Comment"># 1 byte</span> <span id="L23" class="LineNr">23 </span> @@ -91,66 +91,66 @@ if ('onhashchange' in window) { <span id="L29" class="LineNr">29 </span><span class="traceContains">+run: inst: 0x00000007</span> <span id="L30" class="LineNr">30 </span> <span id="L31" class="LineNr">31 </span><span class="Delimiter">:(code)</span> -<span id="L32" class="LineNr">32 </span><span class="Normal">void</span> <a href='subx.cc.html#L8276'>create_test_function</a><span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L33" class="LineNr">33 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L34" class="LineNr">34 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span>segments<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L35" class="LineNr">35 </span> trace<span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- create 'run-tests'"</span> << end<span class="Delimiter">();</span> +<span id="L32" class="LineNr">32 </span><span class="Normal">void</span> create_test_function<span class="Delimiter">(</span>program& p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L33" class="LineNr">33 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L34" class="LineNr">34 </span> segment& <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L35" class="LineNr">35 </span> <a href='003trace.cc.html#L203'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"-- create 'run-tests'"</span> << end<span class="Delimiter">();</span> <span id="L36" class="LineNr">36 </span> vector<line> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">;</span> -<span id="L37" class="LineNr">37 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L38" class="LineNr">38 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L39" class="LineNr">39 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L40" class="LineNr">40 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> +<span id="L37" class="LineNr">37 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L38" class="LineNr">38 </span> line& inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L39" class="LineNr">39 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L40" class="LineNr">40 </span> <span class="Normal">const</span> word& curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span> <span id="L41" class="LineNr">41 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span class="Comment">// not a label</span> <span id="L42" class="LineNr">42 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!starts_with<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">"test-"</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> -<span id="L43" class="LineNr">43 </span> string fn = drop_last<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> +<span id="L43" class="LineNr">43 </span> string fn = <a href='035labels.cc.html#L204'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span> <span id="L44" class="LineNr">44 </span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">(</span>fn<span class="Delimiter">));</span> <span id="L45" class="LineNr">45 </span> <span class="Delimiter">}</span> <span id="L46" class="LineNr">46 </span> <span class="Delimiter">}</span> <span id="L47" class="LineNr">47 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// no tests found</span> -<span id="L48" class="LineNr">48 </span> <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">"run-tests"</span><span class="Delimiter">));</span> -<span id="L49" class="LineNr">49 </span> <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> -<span id="L50" class="LineNr">50 </span> <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>lines<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='subx.cc.html#L8331'>ret</a><span class="Delimiter">());</span> +<span id="L48" class="LineNr">48 </span> <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">"run-tests"</span><span class="Delimiter">));</span> +<span id="L49" class="LineNr">49 </span> <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>insert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> <a href='040---tests.cc.html#L36'>new_insts</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span> +<span id="L50" class="LineNr">50 </span> <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>ret<span class="Delimiter">());</span> <span id="L51" class="LineNr">51 </span><span class="Delimiter">}</span> <span id="L52" class="LineNr">52 </span> <span id="L53" class="LineNr">53 </span>string to_string<span class="Delimiter">(</span><span class="Normal">const</span> segment& s<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L54" class="LineNr">54 </span> ostringstream out<span class="Delimiter">;</span> -<span id="L55" class="LineNr">55 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < SIZE<span class="Delimiter">(</span>s<span class="Delimiter">.</span>lines<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L56" class="LineNr">56 </span> <span class="Normal">const</span> line& l = s<span class="Delimiter">.</span>lines<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> -<span id="L57" class="LineNr">57 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < SIZE<span class="Delimiter">(</span>l<span class="Delimiter">.</span>words<span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L55" class="LineNr">55 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L56" class="LineNr">56 </span> <span class="Normal">const</span> line& l = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> +<span id="L57" class="LineNr">57 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span> j < <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span> ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L58" class="LineNr">58 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>j > <span class="Constant">0</span><span class="Delimiter">)</span> out << <span class="Constant">' '</span><span class="Delimiter">;</span> -<span id="L59" class="LineNr">59 </span> out << to_string<span class="Delimiter">(</span>l<span class="Delimiter">.</span>words<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span> +<span id="L59" class="LineNr">59 </span> out << to_string<span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span> <span id="L60" class="LineNr">60 </span> <span class="Delimiter">}</span> <span id="L61" class="LineNr">61 </span> out << <span class="cSpecial">'\n'</span><span class="Delimiter">;</span> <span id="L62" class="LineNr">62 </span> <span class="Delimiter">}</span> <span id="L63" class="LineNr">63 </span> <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span> <span id="L64" class="LineNr">64 </span><span class="Delimiter">}</span> <span id="L65" class="LineNr">65 </span> -<span id="L66" class="LineNr">66 </span>line call<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L67" class="LineNr">67 </span> line result<span class="Delimiter">;</span> -<span id="L68" class="LineNr">68 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">());</span> -<span id="L69" class="LineNr">69 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='subx.cc.html#L8324'>disp32</a><span class="Delimiter">(</span>s<span class="Delimiter">));</span> +<span id="L66" class="LineNr">66 </span><a href='011run.cc.html#L117'>line</a> call<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L67" class="LineNr">67 </span> <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span> +<span id="L68" class="LineNr">68 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>call<span class="Delimiter">());</span> +<span id="L69" class="LineNr">69 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>disp32<span class="Delimiter">(</span>s<span class="Delimiter">));</span> <span id="L70" class="LineNr">70 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L71" class="LineNr">71 </span><span class="Delimiter">}</span> <span id="L72" class="LineNr">72 </span> -<span id="L73" class="LineNr">73 </span>word call<span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L74" class="LineNr">74 </span> word result<span class="Delimiter">;</span> +<span id="L73" class="LineNr">73 </span><a href='011run.cc.html#L123'>word</a> call<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L74" class="LineNr">74 </span> <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span> <span id="L75" class="LineNr">75 </span> result<span class="Delimiter">.</span>data = <span class="Constant">"e8"</span><span class="Delimiter">;</span> <span id="L76" class="LineNr">76 </span> result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">"call"</span><span class="Delimiter">);</span> <span id="L77" class="LineNr">77 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L78" class="LineNr">78 </span><span class="Delimiter">}</span> <span id="L79" class="LineNr">79 </span> -<span id="L80" class="LineNr">80 </span>word <a href='subx.cc.html#L8324'>disp32</a><span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L81" class="LineNr">81 </span> word result<span class="Delimiter">;</span> +<span id="L80" class="LineNr">80 </span><a href='011run.cc.html#L123'>word</a> disp32<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L81" class="LineNr">81 </span> <a href='011run.cc.html#L123'>word</a> result<span class="Delimiter">;</span> <span id="L82" class="LineNr">82 </span> result<span class="Delimiter">.</span>data = s<span class="Delimiter">;</span> <span id="L83" class="LineNr">83 </span> result<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">"disp32"</span><span class="Delimiter">);</span> <span id="L84" class="LineNr">84 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L85" class="LineNr">85 </span><span class="Delimiter">}</span> <span id="L86" class="LineNr">86 </span> -<span id="L87" class="LineNr">87 </span>line <a href='subx.cc.html#L8331'>ret</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L88" class="LineNr">88 </span> line result<span class="Delimiter">;</span> -<span id="L89" class="LineNr">89 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>word<span class="Delimiter">());</span> -<span id="L90" class="LineNr">90 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Constant">"c3"</span><span class="Delimiter">;</span> -<span id="L91" class="LineNr">91 </span> result<span class="Delimiter">.</span>words<span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">"return"</span><span class="Delimiter">);</span> +<span id="L87" class="LineNr">87 </span><a href='011run.cc.html#L117'>line</a> ret<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L88" class="LineNr">88 </span> <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span> +<span id="L89" class="LineNr">89 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span> +<span id="L90" class="LineNr">90 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Constant">"c3"</span><span class="Delimiter">;</span> +<span id="L91" class="LineNr">91 </span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">"return"</span><span class="Delimiter">);</span> <span id="L92" class="LineNr">92 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L93" class="LineNr">93 </span><span class="Delimiter">}</span> </pre> diff --git a/html/subx/051test.subx.html b/html/subx/051test.subx.html index e747eb9f..6e616a8a 100644 --- a/html/subx/051test.subx.html +++ b/html/subx/051test.subx.html @@ -93,53 +93,52 @@ if ('onhashchange' in window) { <span id="L38" class="LineNr">38 </span> 68/push 2/imm32/stderr <span id="L39" class="LineNr">39 </span> <span class="Comment"># call</span> <span id="L40" class="LineNr">40 </span> e8/call _write/disp32 -<span id="L41" class="LineNr">41 </span> <span class="Comment"># discard arg</span> +<span id="L41" class="LineNr">41 </span> <span class="Comment"># discard args</span> <span id="L42" class="LineNr">42 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> <span id="L43" class="LineNr">43 </span> <span class="Comment"># return</span> <span id="L44" class="LineNr">44 </span> eb/jump $check-ints-equal:end/disp8 <span id="L45" class="LineNr">45 </span> <span class="Comment"># else:</span> <span id="L46" class="LineNr">46 </span>$check-ints-equal:else: -<span id="L47" class="LineNr">47 </span> <span class="Comment"># copy third arg (msg) into ECX</span> -<span id="L48" class="LineNr">48 </span> 8b/copy 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> 1/r32/ECX 0x10/disp8 <span class="Delimiter"> . </span> <span class="Comment"># copy *(EBP+16) to ECX</span> -<span id="L49" class="LineNr">49 </span> <span class="Comment"># _write(2/stderr, ECX)</span> -<span id="L50" class="LineNr">50 </span> <span class="Comment"># push args</span> -<span id="L51" class="LineNr">51 </span> 51/push-ECX -<span id="L52" class="LineNr">52 </span> 68/push 2/imm32/stderr -<span id="L53" class="LineNr">53 </span> <span class="Comment"># call</span> -<span id="L54" class="LineNr">54 </span> e8/call _write/disp32 -<span id="L55" class="LineNr">55 </span> <span class="Comment"># discard arg</span> -<span id="L56" class="LineNr">56 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> -<span id="L57" class="LineNr">57 </span> <span class="Comment"># print newline</span> -<span id="L58" class="LineNr">58 </span> <span class="Comment"># push args</span> -<span id="L59" class="LineNr">59 </span> 68/push Newline/imm32 -<span id="L60" class="LineNr">60 </span> 68/push 2/imm32/stderr -<span id="L61" class="LineNr">61 </span> <span class="Comment"># call</span> -<span id="L62" class="LineNr">62 </span> e8/call _write/disp32 -<span id="L63" class="LineNr">63 </span> <span class="Comment"># discard arg</span> -<span id="L64" class="LineNr">64 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> -<span id="L65" class="LineNr">65 </span> <span class="Comment"># increment Num-test-failures</span> -<span id="L66" class="LineNr">66 </span> ff 0/subop/increment 0/mod/indirect 5/rm32/.disp32 <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> Num-test-failures/disp32 <span class="Comment"># increment *Num-test-failures</span> -<span id="L67" class="LineNr">67 </span>$check-ints-equal:end: -<span id="L68" class="LineNr">68 </span> <span class="Comment"># restore registers</span> -<span id="L69" class="LineNr">69 </span> 5b/pop-to-EBX -<span id="L70" class="LineNr">70 </span> 59/pop-to-ECX -<span id="L71" class="LineNr">71 </span> <span class="Comment"># epilog</span> -<span id="L72" class="LineNr">72 </span> 89/copy 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 5/r32/EBP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Comment"># copy EBP to ESP</span> -<span id="L73" class="LineNr">73 </span> 5d/pop-to-EBP -<span id="L74" class="LineNr">74 </span> c3/return -<span id="L75" class="LineNr">75 </span> -<span id="L76" class="LineNr">76 </span>== data -<span id="L77" class="LineNr">77 </span> -<span id="L78" class="LineNr">78 </span>Newline: -<span id="L79" class="LineNr">79 </span> <span class="Comment"># size</span> -<span id="L80" class="LineNr">80 </span> 01 00 00 00 -<span id="L81" class="LineNr">81 </span> <span class="Comment"># data</span> -<span id="L82" class="LineNr">82 </span> 0a/newline -<span id="L83" class="LineNr">83 </span> -<span id="L84" class="LineNr">84 </span>Num-test-failures: -<span id="L85" class="LineNr">85 </span> 00 00 00 00 -<span id="L86" class="LineNr">86 </span> -<span id="L87" class="LineNr">87 </span><span class="Comment"># vim:nowrap:textwidth=0</span> +<span id="L47" class="LineNr">47 </span> <span class="Comment"># _write(2/stderr, msg)</span> +<span id="L48" class="LineNr">48 </span> <span class="Comment"># push args</span> +<span id="L49" class="LineNr">49 </span> 8b/copy 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> 1/r32/ECX 0x10/disp8 <span class="Delimiter"> . </span> <span class="Comment"># copy *(EBP+16) to ECX</span> +<span id="L50" class="LineNr">50 </span> 51/push-ECX +<span id="L51" class="LineNr">51 </span> 68/push 2/imm32/stderr +<span id="L52" class="LineNr">52 </span> <span class="Comment"># call</span> +<span id="L53" class="LineNr">53 </span> e8/call _write/disp32 +<span id="L54" class="LineNr">54 </span> <span class="Comment"># discard args</span> +<span id="L55" class="LineNr">55 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> +<span id="L56" class="LineNr">56 </span> <span class="Comment"># _write(2/stderr, Newline)</span> +<span id="L57" class="LineNr">57 </span> <span class="Comment"># push args</span> +<span id="L58" class="LineNr">58 </span> 68/push Newline/imm32 +<span id="L59" class="LineNr">59 </span> 68/push 2/imm32/stderr +<span id="L60" class="LineNr">60 </span> <span class="Comment"># call</span> +<span id="L61" class="LineNr">61 </span> e8/call _write/disp32 +<span id="L62" class="LineNr">62 </span> <span class="Comment"># discard args</span> +<span id="L63" class="LineNr">63 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> +<span id="L64" class="LineNr">64 </span> <span class="Comment"># increment Num-test-failures</span> +<span id="L65" class="LineNr">65 </span> ff 0/subop/increment 0/mod/indirect 5/rm32/.disp32 <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> Num-test-failures/disp32 <span class="Comment"># increment *Num-test-failures</span> +<span id="L66" class="LineNr">66 </span>$check-ints-equal:end: +<span id="L67" class="LineNr">67 </span> <span class="Comment"># restore registers</span> +<span id="L68" class="LineNr">68 </span> 5b/pop-to-EBX +<span id="L69" class="LineNr">69 </span> 59/pop-to-ECX +<span id="L70" class="LineNr">70 </span> <span class="Comment"># epilog</span> +<span id="L71" class="LineNr">71 </span> 89/copy 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 5/r32/EBP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Comment"># copy EBP to ESP</span> +<span id="L72" class="LineNr">72 </span> 5d/pop-to-EBP +<span id="L73" class="LineNr">73 </span> c3/return +<span id="L74" class="LineNr">74 </span> +<span id="L75" class="LineNr">75 </span>== data +<span id="L76" class="LineNr">76 </span> +<span id="L77" class="LineNr">77 </span>Newline: +<span id="L78" class="LineNr">78 </span> <span class="Comment"># size</span> +<span id="L79" class="LineNr">79 </span> 01 00 00 00 +<span id="L80" class="LineNr">80 </span> <span class="Comment"># data</span> +<span id="L81" class="LineNr">81 </span> 0a/newline +<span id="L82" class="LineNr">82 </span> +<span id="L83" class="LineNr">83 </span>Num-test-failures: +<span id="L84" class="LineNr">84 </span> 00 00 00 00 +<span id="L85" class="LineNr">85 </span> +<span id="L86" class="LineNr">86 </span><span class="Comment"># vim:nowrap:textwidth=0</span> </pre> </body> </html> diff --git a/html/subx/053new_segment.subx.html b/html/subx/053new_segment.subx.html index af0bd778..81d31ac9 100644 --- a/html/subx/053new_segment.subx.html +++ b/html/subx/053new_segment.subx.html @@ -63,11 +63,11 @@ if ('onhashchange' in window) { <span id="L8" class="LineNr"> 8 </span> <span id="L9" class="LineNr"> 9 </span><span class="Comment"># main: (manual test if this is the last file loaded)</span> <span id="L10" class="LineNr">10 </span> <span class="Comment"># EAX = new-segment(0x1000)</span> -<span id="L11" class="LineNr">11 </span> <span class="Comment"># push arg</span> +<span id="L11" class="LineNr">11 </span> <span class="Comment"># push args</span> <span id="L12" class="LineNr">12 </span> 68/push 0x1000/imm32 <span id="L13" class="LineNr">13 </span> <span class="Comment"># call</span> <span id="L14" class="LineNr">14 </span> e8/call new-segment/disp32 -<span id="L15" class="LineNr">15 </span> <span class="Comment"># discard arg</span> +<span id="L15" class="LineNr">15 </span> <span class="Comment"># discard args</span> <span id="L16" class="LineNr">16 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L17" class="LineNr">17 </span> <span id="L18" class="LineNr">18 </span> <span class="Comment"># store to *EAX</span> diff --git a/html/subx/055trace.subx.html b/html/subx/055trace.subx.html index b5ee6e66..1719cd50 100644 --- a/html/subx/055trace.subx.html +++ b/html/subx/055trace.subx.html @@ -109,11 +109,11 @@ if ('onhashchange' in window) { <span id="L54" class="LineNr"> 54 </span><span class="Comment"># The Trace-stream segment will consist of variable-length lines separated by newlines (0x0a)</span> <span id="L55" class="LineNr"> 55 </span>initialize-trace-stream: <span id="L56" class="LineNr"> 56 </span> <span class="Comment"># EAX = new-segment(0x1000)</span> -<span id="L57" class="LineNr"> 57 </span> <span class="Comment"># push arg</span> +<span id="L57" class="LineNr"> 57 </span> <span class="Comment"># push args</span> <span id="L58" class="LineNr"> 58 </span> 68/push 0x1000/imm32/N <span id="L59" class="LineNr"> 59 </span> <span class="Comment"># call</span> <span id="L60" class="LineNr"> 60 </span> e8/call new-segment/disp32 -<span id="L61" class="LineNr"> 61 </span> <span class="Comment"># discard arg</span> +<span id="L61" class="LineNr"> 61 </span> <span class="Comment"># discard args</span> <span id="L62" class="LineNr"> 62 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L63" class="LineNr"> 63 </span> <span class="Comment"># copy EAX to *Trace-stream</span> <span id="L64" class="LineNr"> 64 </span> 89/copy 0/mod/indirect 5/rm32/.disp32 <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0/r32/EAX Trace-stream/disp32 <span class="Comment"># copy EAX to *Trace-stream</span> diff --git a/html/subx/057stop.subx.html b/html/subx/057stop.subx.html index 9e0d3fbb..a985e710 100644 --- a/html/subx/057stop.subx.html +++ b/html/subx/057stop.subx.html @@ -153,8 +153,8 @@ if ('onhashchange' in window) { <span id="L96" class="LineNr"> 96 </span> <span class="Comment"># exit(value) if ed->target == 0</span> <span id="L97" class="LineNr"> 97 </span> 81 7/subop/compare 0/mod/indirect 0/rm32/EAX <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0/imm32 <span class="Comment"># compare *EAX</span> <span id="L98" class="LineNr"> 98 </span> 75/jump-if-not-equal $stop:fake/disp8 -<span id="L99" class="LineNr"> 99 </span> <span class="Comment"># syscall(exit, ed->value)</span> -<span id="L100" class="LineNr">100 </span> 8b/copy 1/mod/*+disp8 0/rm32/EAX <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 3/r32/EBX 4/disp8 <span class="Delimiter"> . </span> <span class="Comment"># copy *(EAX+4) to EBX</span> +<span id="L99" class="LineNr"> 99 </span> <span class="Comment"># syscall(exit, value)</span> +<span id="L100" class="LineNr">100 </span> 8b/copy 1/mod/*+disp8 4/rm32/sib 4/base/ESP 4/index/none <span class="Delimiter"> . </span> 3/r32/EBX 8/disp8 <span class="Delimiter"> . </span> <span class="Comment"># copy *(ESP+8) to EBX</span> <span id="L101" class="LineNr">101 </span> b8/copy-to-EAX 1/imm32 <span id="L102" class="LineNr">102 </span> cd/syscall 0x80/imm8 <span id="L103" class="LineNr">103 </span>$stop:fake: @@ -191,12 +191,12 @@ if ('onhashchange' in window) { <span id="L134" class="LineNr">134 </span> <span class="Comment"># discard args</span> <span id="L135" class="LineNr">135 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> <span id="L136" class="LineNr">136 </span> <span class="Comment"># call _test-stop-1(ed)</span> -<span id="L137" class="LineNr">137 </span> <span class="Comment"># push arg</span> +<span id="L137" class="LineNr">137 </span> <span class="Comment"># push args</span> <span id="L138" class="LineNr">138 </span> 50/push-EAX <span id="L139" class="LineNr">139 </span> <span class="Comment"># call</span> <span id="L140" class="LineNr">140 </span> e8/call _test-stop-1/disp32 <span id="L141" class="LineNr">141 </span> <span class="SalientComment">## registers except ESP may be clobbered at this point</span> -<span id="L142" class="LineNr">142 </span> <span class="Comment"># restore arg</span> +<span id="L142" class="LineNr">142 </span> <span class="Comment"># restore args</span> <span id="L143" class="LineNr">143 </span> 58/pop-to-EAX <span id="L144" class="LineNr">144 </span> <span class="Comment"># check that _test-stop-1 tried to call exit(1)</span> <span id="L145" class="LineNr">145 </span> <span class="Comment"># check-ints-equal(ed->value, 2, msg) # i.e. stop was called with value 1</span> @@ -220,12 +220,12 @@ if ('onhashchange' in window) { <span id="L163" class="LineNr">163 </span> 55/push-EBP <span id="L164" class="LineNr">164 </span> 89/copy 3/mod/direct 5/rm32/EBP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/r32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Comment"># copy ESP to EBP</span> <span id="L165" class="LineNr">165 </span> <span class="Comment"># _test-stop-2(ed)</span> -<span id="L166" class="LineNr">166 </span> <span class="Comment"># push arg</span> +<span id="L166" class="LineNr">166 </span> <span class="Comment"># push args</span> <span id="L167" class="LineNr">167 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+8)</span> <span id="L168" class="LineNr">168 </span> <span class="Comment"># call</span> <span id="L169" class="LineNr">169 </span> e8/call _test-stop-2/disp32 <span id="L170" class="LineNr">170 </span> <span class="SalientComment">## should never get past this point</span> -<span id="L171" class="LineNr">171 </span> <span class="Comment"># discard arg</span> +<span id="L171" class="LineNr">171 </span> <span class="Comment"># discard args</span> <span id="L172" class="LineNr">172 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L173" class="LineNr">173 </span> <span class="Comment"># signal test failed: check-ints-equal(1, 0, msg)</span> <span id="L174" class="LineNr">174 </span> <span class="Comment"># push args</span> diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html index 5bd1da84..c848a55f 100644 --- a/html/subx/apps/crenshaw2-1.subx.html +++ b/html/subx/apps/crenshaw2-1.subx.html @@ -54,94 +54,106 @@ if ('onhashchange' in window) { </head> <body onload='JumpToLine();'> <pre id='vimCodeElement'> -<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span> -<span id="L2" class="LineNr"> 2 </span><span class="Comment"># corresponds to the section "single digits" in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span> -<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span> -<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run (from the subx directory):</span> -<span id="L5" class="LineNr"> 5 </span><span class="Comment"># $ subx translate *.subx apps/crenshaw2.1.subx -o crenshaw 2.1</span> -<span id="L6" class="LineNr"> 6 </span><span class="Comment"># $ echo '3' |subx run apps/crenshaw2.1 |xxd -</span> -<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected output:</span> -<span id="L8" class="LineNr"> 8 </span><span class="Comment"># TODO</span> -<span id="L9" class="LineNr"> 9 </span><span class="Comment">#</span> -<span id="L10" class="LineNr">10 </span><span class="Comment"># The output is the code a function would need to include, returning the</span> -<span id="L11" class="LineNr">11 </span><span class="Comment"># result in EAX.</span> -<span id="L12" class="LineNr">12 </span><span class="Comment">#</span> -<span id="L13" class="LineNr">13 </span><span class="Comment"># Major note: byte strings are not null-terminated. Instead they're prefixed</span> -<span id="L14" class="LineNr">14 </span><span class="Comment"># with a 32-bit length.</span> -<span id="L15" class="LineNr">15 </span> -<span id="L16" class="LineNr">16 </span>== code -<span id="L17" class="LineNr">17 </span><span class="Comment"># instruction effective address operand displacement immediate</span> -<span id="L18" class="LineNr">18 </span><span class="Comment"># op subop mod rm32 base index scale r32</span> -<span id="L19" class="LineNr">19 </span><span class="Comment"># 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes</span> -<span id="L20" class="LineNr">20 </span> -<span id="L21" class="LineNr">21 </span><span class="Comment"># main:</span> -<span id="L22" class="LineNr">22 </span> <span class="Comment"># abort("Integer")</span> -<span id="L23" class="LineNr">23 </span> <span class="Comment"># push args</span> -<span id="L24" class="LineNr">24 </span> 68/push "Integer"/imm32 -<span id="L25" class="LineNr">25 </span> <span class="Comment"># call</span> -<span id="L26" class="LineNr">26 </span> e8/call abort/disp32 -<span id="L27" class="LineNr">27 </span> <span class="Comment"># discard arg</span> -<span id="L28" class="LineNr">28 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> -<span id="L29" class="LineNr">29 </span> <span class="Comment"># syscall(exit, 0)</span> -<span id="L30" class="LineNr">30 </span> bb/copy-to-EBX 0/imm32 -<span id="L31" class="LineNr">31 </span> b8/copy-to-EAX 1/imm32/exit -<span id="L32" class="LineNr">32 </span> cd/syscall 0x80/imm8 -<span id="L33" class="LineNr">33 </span> -<span id="L34" class="LineNr">34 </span><span class="SalientComment">## helpers</span> -<span id="L35" class="LineNr">35 </span> -<span id="L36" class="LineNr">36 </span><span class="Comment"># print error message and exit</span> -<span id="L37" class="LineNr">37 </span><span class="Comment"># really maps to the 'Expected' function in Crenshaw</span> -<span id="L38" class="LineNr">38 </span>abort: <span class="Comment"># s : (address array byte) -> <void></span> -<span id="L39" class="LineNr">39 </span> <span class="Comment"># error(s)</span> -<span id="L40" class="LineNr">40 </span> <span class="Comment"># push args</span> -<span id="L41" class="LineNr">41 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 4/base/ESP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(ESP+4)</span> -<span id="L42" class="LineNr">42 </span> <span class="Comment"># call</span> -<span id="L43" class="LineNr">43 </span> e8/call error/disp32 -<span id="L44" class="LineNr">44 </span> <span class="Comment"># discard arg</span> -<span id="L45" class="LineNr">45 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> -<span id="L46" class="LineNr">46 </span> <span class="Comment"># syscall(exit, 1)</span> -<span id="L47" class="LineNr">47 </span> bb/copy-to-EBX 1/imm32 -<span id="L48" class="LineNr">48 </span> b8/copy-to-EAX 1/imm32/exit -<span id="L49" class="LineNr">49 </span> cd/syscall 0x80/imm8 -<span id="L50" class="LineNr">50 </span> -<span id="L51" class="LineNr">51 </span><span class="Comment"># print out "Error: #{s} expected\n" to stderr</span> -<span id="L52" class="LineNr">52 </span>error: <span class="Comment"># s : (address array byte) -> <void></span> -<span id="L53" class="LineNr">53 </span> <span class="Comment"># write(2/stderr, "Error: ")</span> -<span id="L54" class="LineNr">54 </span> <span class="Comment"># push args</span> -<span id="L55" class="LineNr">55 </span> 68/push "Error: "/imm32 -<span id="L56" class="LineNr">56 </span> 68/push 2/imm32/stderr -<span id="L57" class="LineNr">57 </span> <span class="Comment"># call</span> -<span id="L58" class="LineNr">58 </span> e8/call write/disp32 -<span id="L59" class="LineNr">59 </span> <span class="Comment"># discard arg</span> -<span id="L60" class="LineNr">60 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> -<span id="L61" class="LineNr">61 </span> <span class="Comment"># write(2/stderr, s)</span> -<span id="L62" class="LineNr">62 </span> <span class="Comment"># push args</span> -<span id="L63" class="LineNr">63 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 4/base/ESP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(ESP+4)</span> -<span id="L64" class="LineNr">64 </span> 68/push 2/imm32/stderr -<span id="L65" class="LineNr">65 </span> <span class="Comment"># call</span> -<span id="L66" class="LineNr">66 </span> e8/call write/disp32 -<span id="L67" class="LineNr">67 </span> <span class="Comment"># discard arg</span> -<span id="L68" class="LineNr">68 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> -<span id="L69" class="LineNr">69 </span> <span class="Comment"># write(2/stderr, " expected")</span> -<span id="L70" class="LineNr">70 </span> <span class="Comment"># push args</span> -<span id="L71" class="LineNr">71 </span> 68/push " expected"/imm32 -<span id="L72" class="LineNr">72 </span> 68/push 2/imm32/stderr -<span id="L73" class="LineNr">73 </span> <span class="Comment"># call</span> -<span id="L74" class="LineNr">74 </span> e8/call write/disp32 -<span id="L75" class="LineNr">75 </span> <span class="Comment"># discard arg</span> -<span id="L76" class="LineNr">76 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> -<span id="L77" class="LineNr">77 </span> <span class="Comment"># write(2/stderr, "\n")</span> -<span id="L78" class="LineNr">78 </span> <span class="Comment"># push args</span> -<span id="L79" class="LineNr">79 </span> 68/push Newline/imm32 -<span id="L80" class="LineNr">80 </span> 68/push 2/imm32/stderr -<span id="L81" class="LineNr">81 </span> <span class="Comment"># call</span> -<span id="L82" class="LineNr">82 </span> e8/call write/disp32 -<span id="L83" class="LineNr">83 </span> <span class="Comment"># discard arg</span> -<span id="L84" class="LineNr">84 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> -<span id="L85" class="LineNr">85 </span> <span class="Comment"># end</span> -<span id="L86" class="LineNr">86 </span> c3/return -<span id="L87" class="LineNr">87 </span> -<span id="L88" class="LineNr">88 </span><span class="Comment"># vim:nowrap:textwidth=0</span> +<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span> +<span id="L2" class="LineNr"> 2 </span><span class="Comment"># corresponds to the section "single digits" in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span> +<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span> +<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run (from the subx directory):</span> +<span id="L5" class="LineNr"> 5 </span><span class="Comment"># $ ./subx translate *.subx apps/crenshaw2-1.subx -o crenshaw2-1</span> +<span id="L6" class="LineNr"> 6 </span><span class="Comment"># $ echo '3' |./subx run apps/crenshaw2-1</span> +<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected output (not working yet):</span> +<span id="L8" class="LineNr"> 8 </span><span class="Comment"># # syscall(exit, 3)</span> +<span id="L9" class="LineNr"> 9 </span><span class="Comment"># bb/copy-to-EBX 3/imm32</span> +<span id="L10" class="LineNr"> 10 </span><span class="Comment"># b8/copy-to-EAX 1/imm32/exit</span> +<span id="L11" class="LineNr"> 11 </span><span class="Comment"># cd/syscall 0x80/imm8</span> +<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span> +<span id="L13" class="LineNr"> 13 </span><span class="Comment"># To run the generated output:</span> +<span id="L14" class="LineNr"> 14 </span><span class="Comment"># $ echo '3' |./subx run apps/crenshaw2-1 > z1.subx</span> +<span id="L15" class="LineNr"> 15 </span><span class="Comment"># $ ./subx translate z1.subx -o z1</span> +<span id="L16" class="LineNr"> 16 </span><span class="Comment"># $ ./subx run z1</span> +<span id="L17" class="LineNr"> 17 </span><span class="Comment"># $ echo $?</span> +<span id="L18" class="LineNr"> 18 </span><span class="Comment"># 3</span> +<span id="L19" class="LineNr"> 19 </span><span class="Comment">#</span> +<span id="L20" class="LineNr"> 20 </span><span class="Comment"># Stdin must contain just a single hex number. Other input will print an error:</span> +<span id="L21" class="LineNr"> 21 </span><span class="Comment"># $ echo 'xyz' |./subx run apps/crenshaw2-1</span> +<span id="L22" class="LineNr"> 22 </span><span class="Comment"># Error: integer expected</span> +<span id="L23" class="LineNr"> 23 </span> +<span id="L24" class="LineNr"> 24 </span>== code +<span id="L25" class="LineNr"> 25 </span><span class="Comment"># instruction effective address operand displacement immediate</span> +<span id="L26" class="LineNr"> 26 </span><span class="Comment"># op subop mod rm32 base index scale r32</span> +<span id="L27" class="LineNr"> 27 </span><span class="Comment"># 1-3 bytes 3 bits 2 bits 3 bits 3 bits 3 bits 2 bits 2 bits 0/1/2/4 bytes 0/1/2/4 bytes</span> +<span id="L28" class="LineNr"> 28 </span> +<span id="L29" class="LineNr"> 29 </span><span class="Comment"># main:</span> +<span id="L30" class="LineNr"> 30 </span> <span class="Comment"># allocate space for an exit-descriptor</span> +<span id="L31" class="LineNr"> 31 </span> <span class="Comment"># var ed/EAX : (address exit-descriptor)</span> +<span id="L32" class="LineNr"> 32 </span> 81 5/subop/subtract 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># subtract from ESP</span> +<span id="L33" class="LineNr"> 33 </span> 8d/copy-address 0/mod/indirect 4/rm32/sib 4/base/ESP 4/index/none <span class="Delimiter"> . </span> 0/r32/EAX <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Comment"># copy ESP to EAX</span> +<span id="L34" class="LineNr"> 34 </span> <span class="Comment"># clear ed->target (so we really exit)</span> +<span id="L35" class="LineNr"> 35 </span> c7/copy 0/mod/direct 0/rm32/EAX <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0/imm32 <span class="Comment"># copy to *EAX</span> +<span id="L36" class="LineNr"> 36 </span> <span class="Comment"># expected(ed, 2/stderr, "integer")</span> +<span id="L37" class="LineNr"> 37 </span> <span class="Comment"># push args</span> +<span id="L38" class="LineNr"> 38 </span> 68/push "integer"/imm32 +<span id="L39" class="LineNr"> 39 </span> 68/push 2/imm32/stderr +<span id="L40" class="LineNr"> 40 </span> 50/push-EAX +<span id="L41" class="LineNr"> 41 </span> <span class="Comment"># call</span> +<span id="L42" class="LineNr"> 42 </span> e8/call expected/disp32 +<span id="L43" class="LineNr"> 43 </span> <span class="Comment"># discard args</span> +<span id="L44" class="LineNr"> 44 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0xc/imm32 <span class="Comment"># add to ESP</span> +<span id="L45" class="LineNr"> 45 </span> <span class="Comment"># syscall(exit, 0)</span> +<span id="L46" class="LineNr"> 46 </span> bb/copy-to-EBX 0/imm32 +<span id="L47" class="LineNr"> 47 </span> b8/copy-to-EAX 1/imm32/exit +<span id="L48" class="LineNr"> 48 </span> cd/syscall 0x80/imm8 +<span id="L49" class="LineNr"> 49 </span> +<span id="L50" class="LineNr"> 50 </span><span class="SalientComment">## helpers</span> +<span id="L51" class="LineNr"> 51 </span> +<span id="L52" class="LineNr"> 52 </span>expected: <span class="Comment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte)</span> +<span id="L53" class="LineNr"> 53 </span> <span class="Comment"># prolog</span> +<span id="L54" class="LineNr"> 54 </span> 55/push-EBP +<span id="L55" class="LineNr"> 55 </span> 89/copy 3/mod/direct 5/rm32/EBP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/r32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Comment"># copy ESP to EBP</span> +<span id="L56" class="LineNr"> 56 </span> <span class="Comment"># write(f, "Error: ")</span> +<span id="L57" class="LineNr"> 57 </span> <span class="Comment"># push args</span> +<span id="L58" class="LineNr"> 58 </span> 68/push "Error: "/imm32 +<span id="L59" class="LineNr"> 59 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0xc/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+12)</span> +<span id="L60" class="LineNr"> 60 </span> <span class="Comment"># call</span> +<span id="L61" class="LineNr"> 61 </span> e8/call write/disp32 +<span id="L62" class="LineNr"> 62 </span> <span class="Comment"># discard args</span> +<span id="L63" class="LineNr"> 63 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> +<span id="L64" class="LineNr"> 64 </span> <span class="Comment"># write(f, s)</span> +<span id="L65" class="LineNr"> 65 </span> <span class="Comment"># push args</span> +<span id="L66" class="LineNr"> 66 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0x10/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+16)</span> +<span id="L67" class="LineNr"> 67 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0xc/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+12)</span> +<span id="L68" class="LineNr"> 68 </span> <span class="Comment"># call</span> +<span id="L69" class="LineNr"> 69 </span> e8/call write/disp32 +<span id="L70" class="LineNr"> 70 </span> <span class="Comment"># discard args</span> +<span id="L71" class="LineNr"> 71 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> +<span id="L72" class="LineNr"> 72 </span> <span class="Comment"># write(f, " expected")</span> +<span id="L73" class="LineNr"> 73 </span> <span class="Comment"># push args</span> +<span id="L74" class="LineNr"> 74 </span> 68/push " expected"/imm32 +<span id="L75" class="LineNr"> 75 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0xc/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+12)</span> +<span id="L76" class="LineNr"> 76 </span> <span class="Comment"># call</span> +<span id="L77" class="LineNr"> 77 </span> e8/call write/disp32 +<span id="L78" class="LineNr"> 78 </span> <span class="Comment"># discard args</span> +<span id="L79" class="LineNr"> 79 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> +<span id="L80" class="LineNr"> 80 </span> <span class="Comment"># write(f, Newline)</span> +<span id="L81" class="LineNr"> 81 </span> <span class="Comment"># push args</span> +<span id="L82" class="LineNr"> 82 </span> 68/push Newline/imm32 +<span id="L83" class="LineNr"> 83 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 0xc/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+12)</span> +<span id="L84" class="LineNr"> 84 </span> <span class="Comment"># call</span> +<span id="L85" class="LineNr"> 85 </span> e8/call write/disp32 +<span id="L86" class="LineNr"> 86 </span> <span class="Comment"># discard args</span> +<span id="L87" class="LineNr"> 87 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/imm32 <span class="Comment"># add to ESP</span> +<span id="L88" class="LineNr"> 88 </span> <span class="Comment"># stop(ed, 1)</span> +<span id="L89" class="LineNr"> 89 </span> <span class="Comment"># push args</span> +<span id="L90" class="LineNr"> 90 </span> 68/push 1/imm32 +<span id="L91" class="LineNr"> 91 </span> ff 6/subop/push 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 8/disp8 <span class="Delimiter"> . </span> <span class="Comment"># push *(EBP+8)</span> +<span id="L92" class="LineNr"> 92 </span> <span class="Comment"># call</span> +<span id="L93" class="LineNr"> 93 </span> e8/call stop/disp32 +<span id="L94" class="LineNr"> 94 </span> <span class="SalientComment">## should never get past this point</span> +<span id="L95" class="LineNr"> 95 </span> <span class="Comment"># epilog</span> +<span id="L96" class="LineNr"> 96 </span> 89/copy 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 5/r32/EBP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Comment"># copy EBP to ESP</span> +<span id="L97" class="LineNr"> 97 </span> 5d/pop-to-EBP +<span id="L98" class="LineNr"> 98 </span> c3/return +<span id="L99" class="LineNr"> 99 </span> +<span id="L100" class="LineNr">100 </span><span class="Comment"># vim:nowrap:textwidth=0</span> </pre> </body> </html> diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html index 8e65e9cc..a30495cb 100644 --- a/html/subx/apps/factorial.subx.html +++ b/html/subx/apps/factorial.subx.html @@ -98,11 +98,11 @@ if ('onhashchange' in window) { <span id="L42" class="LineNr"> 42 </span> eb/jump $main:end/disp8 <span class="Comment"># where EAX will get copied to EBX</span> <span id="L43" class="LineNr"> 43 </span> <span class="Comment"># else EAX = factorial(5)</span> <span id="L44" class="LineNr"> 44 </span>$run-main: -<span id="L45" class="LineNr"> 45 </span> <span class="Comment"># push arg</span> +<span id="L45" class="LineNr"> 45 </span> <span class="Comment"># push args</span> <span id="L46" class="LineNr"> 46 </span> 68/push 5/imm32 <span id="L47" class="LineNr"> 47 </span> <span class="Comment"># call</span> <span id="L48" class="LineNr"> 48 </span> e8/call factorial/disp32 -<span id="L49" class="LineNr"> 49 </span> <span class="Comment"># discard arg</span> +<span id="L49" class="LineNr"> 49 </span> <span class="Comment"># discard args</span> <span id="L50" class="LineNr"> 50 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L51" class="LineNr"> 51 </span>$main:end: <span id="L52" class="LineNr"> 52 </span> <span class="Comment"># exit(EAX)</span> @@ -129,7 +129,7 @@ if ('onhashchange' in window) { <span id="L73" class="LineNr"> 73 </span> 53/push-EBX <span id="L74" class="LineNr"> 74 </span> <span class="Comment"># call</span> <span id="L75" class="LineNr"> 75 </span> e8/call factorial/disp32 -<span id="L76" class="LineNr"> 76 </span> <span class="Comment"># discard arg</span> +<span id="L76" class="LineNr"> 76 </span> <span class="Comment"># discard args</span> <span id="L77" class="LineNr"> 77 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L78" class="LineNr"> 78 </span> <span class="Comment"># return n * factorial(n-1)</span> <span id="L79" class="LineNr"> 79 </span> f7 4/subop/multiply 1/mod/*+disp8 4/rm32/sib 5/base/EBP 4/index/none 8/disp8 <span class="Delimiter"> . </span> <span class="Comment"># multiply *(EBP+8) into EAX</span> @@ -143,11 +143,11 @@ if ('onhashchange' in window) { <span id="L87" class="LineNr"> 87 </span> <span id="L88" class="LineNr"> 88 </span>test-factorial: <span id="L89" class="LineNr"> 89 </span> <span class="Comment"># factorial(5)</span> -<span id="L90" class="LineNr"> 90 </span> <span class="Comment"># push arg</span> +<span id="L90" class="LineNr"> 90 </span> <span class="Comment"># push args</span> <span id="L91" class="LineNr"> 91 </span> 68/push 5/imm32 <span id="L92" class="LineNr"> 92 </span> <span class="Comment"># call</span> <span id="L93" class="LineNr"> 93 </span> e8/call factorial/disp32 -<span id="L94" class="LineNr"> 94 </span> <span class="Comment"># discard arg</span> +<span id="L94" class="LineNr"> 94 </span> <span class="Comment"># discard args</span> <span id="L95" class="LineNr"> 95 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L96" class="LineNr"> 96 </span> <span class="Comment"># check-ints-equal(EAX, 120, failure message)</span> <span id="L97" class="LineNr"> 97 </span> <span class="Comment"># push args</span> diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html index 1cab461e..7ac67838 100644 --- a/html/subx/examples/ex11.subx.html +++ b/html/subx/examples/ex11.subx.html @@ -328,7 +328,7 @@ if ('onhashchange' in window) { <span id="L272" class="LineNr">272 </span> 68/push "."/imm32 <span id="L273" class="LineNr">273 </span> <span class="Comment"># call</span> <span id="L274" class="LineNr">274 </span> e8/call write-stderr/disp32 -<span id="L275" class="LineNr">275 </span> <span class="Comment"># discard arg</span> +<span id="L275" class="LineNr">275 </span> <span class="Comment"># discard args</span> <span id="L276" class="LineNr">276 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L277" class="LineNr">277 </span> <span class="Comment"># return</span> <span id="L278" class="LineNr">278 </span> eb/jump $check-ints-equal:end/disp8 @@ -341,14 +341,14 @@ if ('onhashchange' in window) { <span id="L285" class="LineNr">285 </span> 51/push-ECX <span id="L286" class="LineNr">286 </span> <span class="Comment"># call</span> <span id="L287" class="LineNr">287 </span> e8/call write-stderr/disp32 -<span id="L288" class="LineNr">288 </span> <span class="Comment"># discard arg</span> +<span id="L288" class="LineNr">288 </span> <span class="Comment"># discard args</span> <span id="L289" class="LineNr">289 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L290" class="LineNr">290 </span> <span class="Comment"># print newline</span> <span id="L291" class="LineNr">291 </span> <span class="Comment"># push args</span> <span id="L292" class="LineNr">292 </span> 68/push Newline/imm32 <span id="L293" class="LineNr">293 </span> <span class="Comment"># call</span> <span id="L294" class="LineNr">294 </span> e8/call write-stderr/disp32 -<span id="L295" class="LineNr">295 </span> <span class="Comment"># discard arg</span> +<span id="L295" class="LineNr">295 </span> <span class="Comment"># discard args</span> <span id="L296" class="LineNr">296 </span> 81 0/subop/add 3/mod/direct 4/rm32/ESP <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> <span class="Delimiter"> . </span> 4/imm32 <span class="Comment"># add to ESP</span> <span id="L297" class="LineNr">297 </span>$check-ints-equal:end: <span id="L298" class="LineNr">298 </span> <span class="Comment"># restore registers</span> |