refactor: Merge halt and halt_on_reset variables in processor_t

riscv-software-src · Sep 27, 2024 · 5c814c7 · 5c814c7
1 parent 871d945
commit 5c814c7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/riscv/execute.cc b/riscv/execute.cc
@@ -216,8 +216,8 @@ void processor_t::step(size_t n)
       enter_debug_mode(DCSR_CAUSE_DEBUGINT, 0);
     } else if (halt_request == HR_GROUP) {
       enter_debug_mode(DCSR_CAUSE_GROUP, 0);
-    } else if (halt) {
-      halt = false;
+    } else if (halt_on_reset) {
+      halt_on_reset = false;
       enter_debug_mode(DCSR_CAUSE_HALT, 0);
     }
   }

diff --git a/riscv/processor.cc b/riscv/processor.cc
@@ -186,8 +186,6 @@ void processor_t::reset()
 {
   xlen = isa.get_max_xlen();
   state.reset(this, isa.get_max_isa());
-  halt = halt_on_reset;
-  halt_on_reset = false;
   if (any_vector_extensions())
     VU.reset();
   in_wfi = false;

diff --git a/riscv/processor.h b/riscv/processor.h
@@ -384,7 +384,6 @@ class processor_t : public abstract_device_t
   FILE *log_file;
   std::ostream sout_; // needed for socket command interface -s, also used for -d and -l, but not for --log
   bool halt_on_reset;
-  bool halt;
   bool in_wfi;
   bool check_triggers_icount;
   std::vector<bool> impl_table;