Allow tracing of multiple stages in qtmips_cli.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

2 files changed, 6 insertions, 5 deletions

diff --git a/qtmips_cli/tracer.cpp b/qtmips_cli/tracer.cpp
index d575680..097842c 100644
--- a/qtmips_cli/tracer.cpp
+++ b/qtmips_cli/tracer.cpp
@@ -67,19 +67,19 @@ void Tracer::fetch() {
 }
 
 void Tracer::decode() {
-    CON_RAW(con_fetch, machine->core(), &Core::instruction_decoded, &Tracer::instruction_decode);
+    CON_RAW(con_decode, machine->core(), &Core::instruction_decoded, &Tracer::instruction_decode);
 }
 
 void Tracer::execute() {
-    CON_RAW(con_fetch, machine->core(), &Core::instruction_executed, &Tracer::instruction_execute);
+    CON_RAW(con_execute, machine->core(), &Core::instruction_executed, &Tracer::instruction_execute);
 }
 
 void Tracer::memory() {
-    CON_RAW(con_fetch, machine->core(), &Core::instruction_memory, &Tracer::instruction_memory);
+    CON_RAW(con_memory, machine->core(), &Core::instruction_memory, &Tracer::instruction_memory);
 }
 
 void Tracer::writeback() {
-    CON_RAW(con_fetch, machine->core(), &Core::instruction_writeback, &Tracer::instruction_writeback);
+    CON_RAW(con_writeback, machine->core(), &Core::instruction_writeback, &Tracer::instruction_writeback);
 }
 
 void Tracer::reg_pc() {
diff --git a/qtmips_cli/tracer.h b/qtmips_cli/tracer.h
index a389da7..eefad8e 100644
--- a/qtmips_cli/tracer.h
+++ b/qtmips_cli/tracer.h
@@ -73,7 +73,8 @@ private:
     bool gp_regs[32];
     bool r_hi, r_lo;
 
-    bool con_fetch, con_regs_pc, con_regs_gp, con_regs_hi_lo;
+    bool con_fetch, con_decode, con_execute, con_memory, con_writeback,
+         con_regs_pc, con_regs_gp, con_regs_hi_lo;
 };
 
 #endif // TRACER_H