diff options
| -rw-r--r-- | subx/010---vm.cc | 9 | ||||
| -rw-r--r-- | subx/039debug.cc | 8 |
2 files changed, 1 insertions, 16 deletions
diff --git a/subx/010---vm.cc b/subx/010---vm.cc index 6fac9cf7..f4fb8119 100644 --- a/subx/010---vm.cc +++ b/subx/010---vm.cc @@ -305,7 +305,7 @@ void run_one_instruction() { } uint32_t inst_start_address = EIP; op = next(); - trace(Callstack_depth, "run") << "0x" << HEXWORD << inst_start_address << " opcode: " << HEXBYTE << NUM(op) << call_label(op) << end(); + trace(Callstack_depth, "run") << "0x" << HEXWORD << inst_start_address << " opcode: " << HEXBYTE << NUM(op) << end(); switch (op) { case 0xf4: // hlt EIP = End_of_program; @@ -378,13 +378,6 @@ void dump_registers() { trace(Callstack_depth+1, "run") << out.str() << end(); } -// debugging info from a later layer -string call_label(uint8_t op) { - if (op != 0xe8) return ""; - // End Trace Call Instruction - return "/call"; -} - //: start tracking supported opcodes :(before "End Globals") map</*op*/string, string> Name; diff --git a/subx/039debug.cc b/subx/039debug.cc index b631336a..ebf39034 100644 --- a/subx/039debug.cc +++ b/subx/039debug.cc @@ -25,14 +25,6 @@ void load_map(const string& map_filename) { if (contains_key(Symbol_name, EIP)) trace(Callstack_depth, "run") << "== label " << get(Symbol_name, EIP) << end(); -//: make calls in particular more salient -:(before "End Trace Call Instruction") -// at this point we've skipped past the e8 opcode, but not the offset operand -int32_t offset = read_mem_i32(EIP); -uint32_t next_eip = EIP+offset+4; -if (contains_key(Symbol_name, next_eip)) - return "/call "+get(Symbol_name, next_eip); - //: If a label starts with '$watch-', make a note of the effective address //: computed by the next instruction. Start dumping out its contents to the //: trace after every subsequent instruction. |