aboutsummaryrefslogtreecommitdiff
path: root/spike_main
diff options
context:
space:
mode:
authorJerry Zhao <jerryz123@berkeley.edu>2022-12-11 10:56:56 -0800
committerJerry Zhao <jerryz123@berkeley.edu>2022-12-13 12:21:11 -0800
commit68a3039598dc418b0fd25e971746bee31e28b3ea (patch)
tree71b301b7463dccf5dae0f037684f8700bd155eb8 /spike_main
parent572d5e44097d9e37c1233a8df4b6bba0c387363c (diff)
downloadriscv-isa-sim-68a3039598dc418b0fd25e971746bee31e28b3ea.zip
riscv-isa-sim-68a3039598dc418b0fd25e971746bee31e28b3ea.tar.gz
riscv-isa-sim-68a3039598dc418b0fd25e971746bee31e28b3ea.tar.bz2
Move boost asio socket interface to socketif_t
This reduces dependencies on config.h in sim.h
Diffstat (limited to 'spike_main')
-rw-r--r--spike_main/spike.cc27
1 files changed, 1 insertions, 26 deletions
diff --git a/spike_main/spike.cc b/spike_main/spike.cc
index 5815761..f0d6920 100644
--- a/spike_main/spike.cc
+++ b/spike_main/spike.cc
@@ -497,29 +497,6 @@ int main(int argc, char** argv)
}
}
-#ifdef HAVE_BOOST_ASIO
- boost::asio::io_service *io_service_ptr = NULL; // needed for socket command interface option -s
- boost::asio::ip::tcp::acceptor *acceptor_ptr = NULL;
- if (socket) { // if command line option -s is set
- try
- { // create socket server
- using boost::asio::ip::tcp;
- io_service_ptr = new boost::asio::io_service;
- acceptor_ptr = new tcp::acceptor(*io_service_ptr, tcp::endpoint(tcp::v4(), 0));
- // aceptor is created passing argument port=0, so O.S. will choose a free port
- std::string name = boost::asio::ip::host_name();
- std::cout << "Listening for debug commands on " << name.substr(0,name.find('.'))
- << " port " << acceptor_ptr->local_endpoint().port() << " ." << std::endl;
- // at the end, add space and some other character for convenience of javascript .split(" ")
- }
- catch (std::exception& e)
- {
- std::cerr << e.what() << std::endl;
- exit(-1);
- }
- }
-#endif
-
if (cfg.explicit_hartids) {
if (nprocs.overridden() && (nprocs() != cfg.nprocs())) {
std::cerr << "Number of specified hartids ("
@@ -542,9 +519,7 @@ int main(int argc, char** argv)
sim_t s(&cfg, halted,
mems, plugin_devices, htif_args, dm_config, log_path, dtb_enabled, dtb_file,
-#ifdef HAVE_BOOST_ASIO
- io_service_ptr, acceptor_ptr,
-#endif
+ socket,
cmd_file);
std::unique_ptr<remote_bitbang_t> remote_bitbang((remote_bitbang_t *) NULL);
std::unique_ptr<jtag_dtm_t> jtag_dtm(