diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-01-18 22:30:38 -0800 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-01-18 22:30:38 -0800 |
| commit | 1f0f3813034921607771bf9627d973ba40fec9e4 (patch) | |
| tree | 217d42f196213dcd4fa684f812da569b27ee5662 | |
| parent | 305770aabc40e20f307cf93667c9f9c825f57813 (diff) | |
| download | mu-1f0f3813034921607771bf9627d973ba40fec9e4.tar.gz | |
4936
| -rw-r--r-- | html/subx/039debug.cc.html | 38 | ||||
| -rw-r--r-- | subx/039debug.cc | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html index 8983218e..df6a779a 100644 --- a/html/subx/039debug.cc.html +++ b/html/subx/039debug.cc.html @@ -63,54 +63,54 @@ 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> <span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><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> <span class="Special">Symbol_name</span><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><a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Constant">"map"</span><span class="Delimiter">);</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="L10" class="LineNr">10 </span><span class="Delimiter">:(code)</span> -<span id="L11" class="LineNr">11 </span><span class="Normal">void</span> <a href='039debug.cc.html#L11'>load_map</a><span class="Delimiter">(</span><span class="Normal">const</span> string& map_filename<span class="Delimiter">)</span> <span class="Delimiter">{</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="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><a href='001help.cc.html#L274'>has_data</a><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>has_data<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> <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> addr<span class="Delimiter">,</span> name<span class="Delimiter">);</span> +<span id="L19" class="LineNr">19 </span> put<span class="Delimiter">(</span><span class="Special">Symbol_name</span><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><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">))</span> -<span id="L25" class="LineNr">25 </span> <a href='003trace.cc.html#L183'>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><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><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>contains_key<span class="Delimiter">(</span><span class="Special">Symbol_name</span><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><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L26" class="LineNr">26 </span> <span id="L27" class="LineNr">27 </span><span class="Comment">//: If a label starts with '$watch-', make a note of the effective address</span> <span id="L28" class="LineNr">28 </span><span class="Comment">//: computed by the next instruction. Start dumping out its contents to the</span> <span id="L29" class="LineNr">29 </span><span class="Comment">//: trace after every subsequent instruction.</span> <span id="L30" class="LineNr">30 </span> <span id="L31" class="LineNr">31 </span><span class="Delimiter">:(after "Run One Instruction")</span> -<span id="L32" class="LineNr">32 </span><a href='039debug.cc.html#L38'>dump_watch_points</a><span class="Delimiter">();</span> +<span id="L32" class="LineNr">32 </span>dump_watch_points<span class="Delimiter">();</span> <span id="L33" class="LineNr">33 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L34" class="LineNr">34 </span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>> <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">;</span> +<span id="L34" class="LineNr">34 </span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>> <span class="Special">Watch_points</span><span class="Delimiter">;</span> <span id="L35" class="LineNr">35 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L36" class="LineNr">36 </span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> +<span id="L36" class="LineNr">36 </span><span class="Special">Watch_points</span><span class="Delimiter">.</span>clear<span class="Delimiter">();</span> <span id="L37" class="LineNr">37 </span><span class="Delimiter">:(code)</span> -<span id="L38" class="LineNr">38 </span><span class="Normal">void</span> <a href='039debug.cc.html#L38'>dump_watch_points</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L39" class="LineNr">39 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> -<span id="L40" class="LineNr">40 </span> <a href='003trace.cc.html#L186'>dbg</a> << <span class="Constant">"watch points:"</span> << end<span class="Delimiter">();</span> -<span id="L41" class="LineNr">41 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>::iterator p = <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> -<span id="L42" class="LineNr">42 </span> <a href='003trace.cc.html#L186'>dbg</a> << <span class="Constant">" "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << p<span class="Delimiter">-></span>second << <span class="Constant">" -> "</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> +<span id="L38" class="LineNr">38 </span><span class="Normal">void</span> dump_watch_points<span class="Delimiter">()</span> <span class="Delimiter">{</span> +<span id="L39" class="LineNr">39 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special">Watch_points</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> +<span id="L40" class="LineNr">40 </span> dbg << <span class="Constant">"watch points:"</span> << end<span class="Delimiter">();</span> +<span id="L41" class="LineNr">41 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>>::iterator p = <span class="Special">Watch_points</span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <span class="Special">Watch_points</span><span class="Delimiter">.</span>end<span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> +<span id="L42" class="LineNr">42 </span> dbg << <span class="Constant">" "</span> << p<span class="Delimiter">-></span>first << <span class="Constant">": "</span> << HEXWORD << p<span class="Delimiter">-></span>second << <span class="Constant">" -> "</span> << HEXWORD << read_mem_u32<span class="Delimiter">(</span>p<span class="Delimiter">-></span>second<span class="Delimiter">)</span> << end<span class="Delimiter">();</span> <span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span> <span id="L44" class="LineNr">44 </span> <span id="L45" class="LineNr">45 </span><span class="Delimiter">:(before "End Globals")</span> <span id="L46" class="LineNr">46 </span>string <span class="Special">Watch_this_effective_address</span><span class="Delimiter">;</span> <span id="L47" class="LineNr">47 </span><span class="Delimiter">:(after "Run One Instruction")</span> <span id="L48" class="LineNr">48 </span><span class="Special">Watch_this_effective_address</span> = <span class="Constant">""</span><span class="Delimiter">;</span> -<span id="L49" class="LineNr">49 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">)</span> && <a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">),</span> <span class="Constant">"$watch-"</span><span class="Delimiter">))</span> -<span id="L50" class="LineNr">50 </span> <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special"><a href='039debug.cc.html#L7'>Symbol_name</a></span><span class="Delimiter">,</span> <a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span> +<span id="L49" class="LineNr">49 </span><span class="Normal">if</span> <span class="Delimiter">(</span>contains_key<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">)</span> && starts_with<span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">),</span> <span class="Constant">"$watch-"</span><span class="Delimiter">))</span> +<span id="L50" class="LineNr">50 </span> <span class="Special">Watch_this_effective_address</span> = get<span class="Delimiter">(</span><span class="Special">Symbol_name</span><span class="Delimiter">,</span> EIP<span class="Delimiter">);</span> <span id="L51" class="LineNr">51 </span><span class="Delimiter">:(after "Found effective_address(addr)")</span> <span id="L52" class="LineNr">52 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!<span class="Special">Watch_this_effective_address</span><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> -<span id="L53" class="LineNr">53 </span> <a href='003trace.cc.html#L186'>dbg</a> << <span class="Constant">"now watching "</span> << <a href='010---vm.cc.html#L413'>HEXWORD</a> << addr << <span class="Constant">" for "</span> << <span class="Special">Watch_this_effective_address</span> << end<span class="Delimiter">();</span> -<span id="L54" class="LineNr">54 </span> <span class="Special"><a href='039debug.cc.html#L34'>Watch_points</a></span>[<span class="Special">Watch_this_effective_address</span>] = addr<span class="Delimiter">;</span> +<span id="L53" class="LineNr">53 </span> dbg << <span class="Constant">"now watching "</span> << HEXWORD << addr << <span class="Constant">" for "</span> << <span class="Special">Watch_this_effective_address</span> << end<span class="Delimiter">();</span> +<span id="L54" class="LineNr">54 </span> put<span class="Delimiter">(</span><span class="Special">Watch_points</span><span class="Delimiter">,</span> <span class="Special">Watch_this_effective_address</span><span class="Delimiter">,</span> addr<span class="Delimiter">);</span> <span id="L55" class="LineNr">55 </span><span class="Delimiter">}</span> </pre> </body> diff --git a/subx/039debug.cc b/subx/039debug.cc index 83ae3f52..4dfcfa3c 100644 --- a/subx/039debug.cc +++ b/subx/039debug.cc @@ -51,5 +51,5 @@ if (contains_key(Symbol_name, EIP) && starts_with(get(Symbol_name, EIP), "$watch :(after "Found effective_address(addr)") if (!Watch_this_effective_address.empty()) { dbg << "now watching " << HEXWORD << addr << " for " << Watch_this_effective_address << end(); - Watch_points[Watch_this_effective_address] = addr; + put(Watch_points, Watch_this_effective_address, addr); } |