Refactor remote bitbang code.

[riscv-isa-sim.git] / spike_main / spike.cc

diff --git a/spike_main/spike.cc b/spike_main/spike.cc
index 576c01f4ec24b8af77b86bfc79945858dc36d6b2..844d8e82d9aa927c0c2cf73215fee8f4397cc87c 100644 (file)
--- a/spike_main/spike.cc
+++ b/spike_main/spike.cc
@@ -79,9 +79,10 @@ int main(int argc, char** argv)
   auto argv1 = parser.parse(argv);
   std::vector<std::string> htif_args(argv1, (const char*const*)argv + argc);
   sim_t s(isa, nprocs, mem_mb, halted, htif_args);
+  std::unique_ptr<jtag_dtm_t> jtag_dtm(new jtag_dtm_t());
   std::unique_ptr<remote_bitbang_t> remote_bitbang;
   if (rbb_port) {
-    remote_bitbang = std::unique_ptr<remote_bitbang_t>(new remote_bitbang_t(rbb_port, &s));
+    remote_bitbang.reset(new remote_bitbang_t(rbb_port, &(*jtag_dtm)));
     s.set_remote_bitbang(&(*remote_bitbang));
   }