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/017jump_disp8.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/017jump_disp8.cc')
-rw-r--r-- | subx/017jump_disp8.cc | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/subx/017jump_disp8.cc b/subx/017jump_disp8.cc index b7bb9300..24467f5c 100644 --- a/subx/017jump_disp8.cc +++ b/subx/017jump_disp8.cc @@ -11,15 +11,15 @@ put_new(Name, "eb", "jump disp8 bytes away (jmp)"); eb 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: eb +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0xeb: { // jump rel8 int8_t offset = static_cast<int>(next()); - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; break; } @@ -36,16 +36,16 @@ put_new(Name, "74", "jump disp8 bytes away if equal, if ZF is set (jcc/jz/je)"); 74 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 74 +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0x74: { // jump rel8 if ZF const int8_t offset = static_cast<int>(next()); if (ZF) { - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; } break; @@ -58,9 +58,9 @@ case 0x74: { // jump rel8 if ZF 74 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 -+run: inst: 0x00000003 -+run: inst: 0x00000008 ++run: 0x00000001 opcode: 74 ++run: 0x00000003 opcode: 05 ++run: 0x00000008 opcode: 05 -run: jump 5 //:: jump if not equal/not zero @@ -75,16 +75,16 @@ put_new(Name, "75", "jump disp8 bytes away if not equal, if ZF is not set (jcc/j 75 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 75 +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0x75: { // jump rel8 unless ZF const int8_t offset = static_cast<int>(next()); if (!ZF) { - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; } break; @@ -97,9 +97,9 @@ case 0x75: { // jump rel8 unless ZF 75 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 -+run: inst: 0x00000003 -+run: inst: 0x00000008 ++run: 0x00000001 opcode: 75 ++run: 0x00000003 opcode: 05 ++run: 0x00000008 opcode: 05 -run: jump 5 //:: jump if greater @@ -116,16 +116,16 @@ put_new(Name, "7f", "jump disp8 bytes away if greater, if ZF is unset and SF == 7f 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 7f +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0x7f: { // jump rel8 if !SF and !ZF const int8_t offset = static_cast<int>(next()); if (!ZF && SF == OF) { - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; } break; @@ -140,9 +140,9 @@ case 0x7f: { // jump rel8 if !SF and !ZF 7f 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 -+run: inst: 0x00000003 -+run: inst: 0x00000008 ++run: 0x00000001 opcode: 7f ++run: 0x00000003 opcode: 05 ++run: 0x00000008 opcode: 05 -run: jump 5 //:: jump if greater or equal @@ -158,16 +158,16 @@ put_new(Name, "7d", "jump disp8 bytes away if greater or equal, if SF == OF (jcc 7d 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 7d +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0x7d: { // jump rel8 if !SF const int8_t offset = static_cast<int>(next()); if (SF == OF) { - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; } break; @@ -181,9 +181,9 @@ case 0x7d: { // jump rel8 if !SF 7d 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 -+run: inst: 0x00000003 -+run: inst: 0x00000008 ++run: 0x00000001 opcode: 7d ++run: 0x00000003 opcode: 05 ++run: 0x00000008 opcode: 05 -run: jump 5 //:: jump if lesser @@ -200,16 +200,16 @@ put_new(Name, "7c", "jump disp8 bytes away if lesser, if SF != OF (jcc/jl/jnge)" 7c 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 7c +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0x7c: { // jump rel8 if SF and !ZF const int8_t offset = static_cast<int>(next()); if (SF != OF) { - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; } break; @@ -224,9 +224,9 @@ case 0x7c: { // jump rel8 if SF and !ZF 7c 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 -+run: inst: 0x00000003 -+run: inst: 0x00000008 ++run: 0x00000001 opcode: 7c ++run: 0x00000003 opcode: 05 ++run: 0x00000008 opcode: 05 -run: jump 5 //:: jump if lesser or equal @@ -243,10 +243,10 @@ put_new(Name, "7e", "jump disp8 bytes away if lesser or equal, if ZF is set or S 7e 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 7e +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(scenario jle_rel8_lesser) % ZF = false; @@ -257,16 +257,16 @@ put_new(Name, "7e", "jump disp8 bytes away if lesser or equal, if ZF is set or S 7e 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 ++run: 0x00000001 opcode: 7e +run: jump 5 -+run: inst: 0x00000008 --run: inst: 0x00000003 ++run: 0x00000008 opcode: 05 +-run: 0x00000003 opcode: 05 :(before "End Single-Byte Opcodes") case 0x7e: { // jump rel8 if SF or ZF const int8_t offset = static_cast<int>(next()); if (ZF || SF != OF) { - trace(90, "run") << "jump " << NUM(offset) << end(); + trace(Callstack_depth+1, "run") << "jump " << NUM(offset) << end(); EIP += offset; } break; @@ -281,7 +281,7 @@ case 0x7e: { // jump rel8 if SF or ZF 7e 05 # skip 1 instruction 05 00 00 00 01 05 00 00 00 02 -+run: inst: 0x00000001 -+run: inst: 0x00000003 -+run: inst: 0x00000008 ++run: 0x00000001 opcode: 7e ++run: 0x00000003 opcode: 05 ++run: 0x00000008 opcode: 05 -run: jump 5 |