Add -H to start halted.

riscv-software-src · May 23, 2016 · bd17c7e · bd17c7e
1 parent 38b8c09
commit bd17c7e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/riscv/gdbserver.cc b/riscv/gdbserver.cc
@@ -15,6 +15,7 @@
 #include "disasm.h"
 #include "sim.h"
 #include "gdbserver.h"
+#include "mmu.h"
 
 template <typename T>
 unsigned int circular_buffer_t<T>::size() const

diff --git a/riscv/sim.cc b/riscv/sim.cc
@@ -20,7 +20,7 @@ static void handle_signal(int sig)
  signal(sig, &handle_signal);
 }
 
-sim_t::sim_t(const char* isa, size_t nprocs, size_t mem_mb,
+sim_t::sim_t(const char* isa, size_t nprocs, size_t mem_mb, bool halted,
  const std::vector<std::string>& args)
  : htif(new htif_isasim_t(this, args)), procs(std::max(nprocs, size_t(1))),
  current_step(0), current_proc(0), debug(false)
@@ -43,8 +43,10 @@ sim_t::sim_t(const char* isa, size_t nprocs, size_t mem_mb,
 
  debug_mmu = new mmu_t(this, NULL);
 
- for (size_t i = 0; i < procs.size(); i++)
+ for (size_t i = 0; i < procs.size(); i++) {
  procs[i] = new processor_t(isa, this, i);
+ procs[i]->set_halted(halted);
+ }
 
  rtc.reset(new rtc_t(procs));
  make_config_string();

diff --git a/riscv/sim.h b/riscv/sim.h
@@ -17,7 +17,7 @@ class mmu_t;
 class sim_t
 {
 public:
- sim_t(const char* isa, size_t _nprocs, size_t mem_mb,
+ sim_t(const char* isa, size_t _nprocs, size_t mem_mb, bool halted,
  const std::vector<std::string>& htif_args);
  ~sim_t();
 

diff --git a/spike_main/spike.cc b/spike_main/spike.cc
@@ -10,7 +10,6 @@
 #include <fesvr/option_parser.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <getopt.h>
 #include <vector>
 #include <string>
 #include <memory>
@@ -25,6 +24,7 @@ static void help()
  fprintf(stderr, " -g Track histogram of PCs\n");
  fprintf(stderr, " -l Generate a log of execution\n");
  fprintf(stderr, " -h Print this help message\n");
+ fprintf(stderr, " -H Start halted, allowing a debugger to connect\n");
  fprintf(stderr, " --isa=<name> RISC-V ISA string [default %s]\n", DEFAULT_ISA);
  fprintf(stderr, " --ic=<S>:<W>:<B> Instantiate a cache model with S sets,\n");
  fprintf(stderr, " --dc=<S>:<W>:<B> W ways, and B-byte blocks (with S and\n");
@@ -38,6 +38,7 @@ static void help()
 int main(int argc, char** argv)
 {
  bool debug = false;
+ bool halted = false;
  bool histogram = false;
  bool log = false;
  bool dump_config_string = false;
@@ -70,10 +71,12 @@ int main(int argc, char** argv)
  exit(-1);
  }
  });
+ // I wanted to use --halted, but for some reason that doesn't work.
+ parser.option('H', 0, 0, [&](const char* s){halted = true;});
 
  auto argv1 = parser.parse(argv);
  std::vector<std::string> htif_args(argv1, (const char*const*)argv + argc);
- sim_t s(isa, nprocs, mem_mb, htif_args);
+ sim_t s(isa, nprocs, mem_mb, halted, htif_args);
  gdbserver_t gdbserver(9824, &s);
  s.set_gdbserver(&gdbserver);