projects
/
riscv-isa-sim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add debug module authentication.
[riscv-isa-sim.git]
/
spike_main
/
spike.cc
diff --git
a/spike_main/spike.cc
b/spike_main/spike.cc
index 1205965f81e4b9eb661d7ea5816f35e30c00d4d4..eb57baf5abfe7360ebcd4010dde0807eda8df032 100644
(file)
--- a/
spike_main/spike.cc
+++ b/
spike_main/spike.cc
@@
-36,7
+36,10
@@
static void help()
fprintf(stderr, " --extlib=<name> Shared library to load\n");
fprintf(stderr, " --rbb-port=<port> Listen on <port> for remote bitbang connection\n");
fprintf(stderr, " --dump-dts Print device tree string and exit\n");
fprintf(stderr, " --extlib=<name> Shared library to load\n");
fprintf(stderr, " --rbb-port=<port> Listen on <port> for remote bitbang connection\n");
fprintf(stderr, " --dump-dts Print device tree string and exit\n");
- fprintf(stderr, " --progsize=<words> progsize for the debug module [default 2]\n");
+ fprintf(stderr, " --progsize=<words> Progsize for the debug module [default 2]\n");
+ fprintf(stderr, " --debug-sba=<bits> Debug bus master supports up to "
+ "<bits> wide accesses [default 0]\n");
+ fprintf(stderr, " --debug-auth Debug module requires debugger to authenticate\n");
exit(1);
}
exit(1);
}
@@
-47,6
+50,8
@@
static std::vector<std::pair<reg_t, mem_t*>> make_mems(const char* arg)
auto mb = strtoull(arg, &p, 0);
if (*p == 0) {
reg_t size = reg_t(mb) << 20;
auto mb = strtoull(arg, &p, 0);
if (*p == 0) {
reg_t size = reg_t(mb) << 20;
+ if (size != (size_t)size)
+ throw std::runtime_error("Size would overflow size_t");
return std::vector<std::pair<reg_t, mem_t*>>(1, std::make_pair(reg_t(DRAM_BASE), new mem_t(size)));
}
return std::vector<std::pair<reg_t, mem_t*>>(1, std::make_pair(reg_t(DRAM_BASE), new mem_t(size)));
}
@@
-87,6
+92,8
@@
int main(int argc, char** argv)
uint16_t rbb_port = 0;
bool use_rbb = false;
unsigned progsize = 2;
uint16_t rbb_port = 0;
bool use_rbb = false;
unsigned progsize = 2;
+ unsigned max_bus_master_bits = 0;
+ bool require_authentication = false;
std::vector<int> hartids;
auto const hartids_parser = [&](const char *s) {
std::vector<int> hartids;
auto const hartids_parser = [&](const char *s) {
@@
-128,6
+135,10
@@
int main(int argc, char** argv)
}
});
parser.option(0, "progsize", 1, [&](const char* s){progsize = atoi(s);});
}
});
parser.option(0, "progsize", 1, [&](const char* s){progsize = atoi(s);});
+ parser.option(0, "debug-sba", 1,
+ [&](const char* s){max_bus_master_bits = atoi(s);});
+ parser.option(0, "debug-auth", 0,
+ [&](const char* s){require_authentication = true;});
auto argv1 = parser.parse(argv);
std::vector<std::string> htif_args(argv1, (const char*const*)argv + argc);
auto argv1 = parser.parse(argv);
std::vector<std::string> htif_args(argv1, (const char*const*)argv + argc);
@@
-135,7
+146,7
@@
int main(int argc, char** argv)
mems = make_mems("2048");
sim_t s(isa, nprocs, halted, start_pc, mems, htif_args, std::move(hartids),
mems = make_mems("2048");
sim_t s(isa, nprocs, halted, start_pc, mems, htif_args, std::move(hartids),
- progsize);
+ progsize
, max_bus_master_bits, require_authentication
);
std::unique_ptr<remote_bitbang_t> remote_bitbang((remote_bitbang_t *) NULL);
std::unique_ptr<jtag_dtm_t> jtag_dtm(new jtag_dtm_t(&s.debug_module));
if (use_rbb) {
std::unique_ptr<remote_bitbang_t> remote_bitbang((remote_bitbang_t *) NULL);
std::unique_ptr<jtag_dtm_t> jtag_dtm(new jtag_dtm_t(&s.debug_module));
if (use_rbb) {