diff options
author | Kartik Agaram <vc@akkartik.com> | 2019-02-25 00:17:46 -0800 |
---|---|---|
committer | Kartik Agaram <vc@akkartik.com> | 2019-02-25 01:50:53 -0800 |
commit | c442a5ad806b6cccbb3ec4c5744b14b0c1f31a01 (patch) | |
tree | 318fb1d56e7ee3c750635d3326ad0739dfdacefe /subx/011run.cc | |
parent | e5998f74ac29bb4bf2aedfdd6fbea801ffdb08f6 (diff) | |
download | mu-c442a5ad806b6cccbb3ec4c5744b14b0c1f31a01.tar.gz |
4987 - support `browse_trace` tool in SubX
I've extracted it into a separate binary, independent of my Mu prototype. I also cleaned up my tracing layer to be a little nicer. Major improvements: - Realized that incremental tracing really ought to be the default. And to minimize printing traces to screen. - Finally figured out how to combine layers and call stack frames in a single dimension of depth. The answer: optimize for the experience of `browse_trace`. Instructions occupy a range of depths based on their call stack frame, and minor details of an instruction lie one level deeper in each case. Other than that, I spent some time adjusting levels everywhere to make `browse_trace` useful.
Diffstat (limited to 'subx/011run.cc')
-rw-r--r-- | subx/011run.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/subx/011run.cc b/subx/011run.cc index 45a6699e..90af649b 100644 --- a/subx/011run.cc +++ b/subx/011run.cc @@ -127,7 +127,6 @@ struct word { :(code) void parse(istream& fin, program& out) { vector<line> l; - trace(99, "parse") << "begin" << end(); while (has_data(fin)) { string line_data; line curr; @@ -151,7 +150,7 @@ void parse(istream& fin, program& out) { s.start = parse_int(segment_title); sanity_check_program_segment(out, s.start); if (trace_contains_errors()) continue; - trace(99, "parse") << "new segment from 0x" << HEXWORD << s.start << end(); + trace(3, "parse") << "new segment from 0x" << HEXWORD << s.start << end(); out.segments.push_back(s); } // End Segment Parsing Special-cases(segment_title) @@ -226,16 +225,13 @@ vector<transform_fn> Transform; :(code) void transform(program& p) { - trace(99, "transform") << "begin" << end(); for (int t = 0; t < SIZE(Transform); ++t) (*Transform.at(t))(p); - trace(99, "transform") << "done" << end(); } //:: load void load(const program& p) { - trace(99, "load") << "begin" << end(); if (p.segments.empty()) { raise << "no code to run\n" << end(); return; @@ -265,7 +261,6 @@ void load(const program& p) { } EIP = p.segments.at(0).start; // End Initialize EIP - trace(99, "load") << "done" << end(); } uint8_t hex_byte(const string& s) { @@ -331,7 +326,7 @@ put_new(Name, "05", "add imm32 to EAX (add)"); :(before "End Single-Byte Opcodes") case 0x05: { // add imm32 to EAX int32_t arg2 = next32(); - trace(90, "run") << "add imm32 0x" << HEXWORD << arg2 << " to reg EAX" << end(); + trace(Callstack_depth+1, "run") << "add imm32 0x" << HEXWORD << arg2 << " to reg EAX" << end(); BINARY_ARITHMETIC_OP(+, Reg[EAX].i, arg2); break; } |