declare socket properties in processor_t

2 files changed, 26 insertions, 1 deletions

diff --git a/spike_main/spike-log-parser.cc b/spike_main/spike-log-parser.cc
index d174afc..80a590b 100644
--- a/spike_main/spike-log-parser.cc
+++ b/spike_main/spike-log-parser.cc
@@ -27,7 +27,7 @@ int main(int argc, char** argv)
   parser.option(0, "isa", 1, [&](const char* s){isa = s;});
   parser.parse(argv);
 
-  processor_t p(isa, DEFAULT_PRIV, DEFAULT_VARCH, 0, 0, false, nullptr);
+  processor_t p(isa, DEFAULT_PRIV, DEFAULT_VARCH, 0, 0, false, nullptr, nullptr);
   if (extension) {
     p.register_extension(extension());
   }
diff --git a/spike_main/spike.cc b/spike_main/spike.cc
index cfd2cd7..43431a6 100644
--- a/spike_main/spike.cc
+++ b/spike_main/spike.cc
@@ -15,6 +15,8 @@
 #include <fstream>
 #include "../VERSION"
 
+using std::string;
+
 static void help(int exit_code = 1)
 {
   fprintf(stderr, "Spike RISC-V ISA Simulator " SPIKE_VERSION "\n\n");
@@ -27,6 +29,9 @@ static void help(int exit_code = 1)
   fprintf(stderr, "  -d                    Interactive debug mode\n");
   fprintf(stderr, "  -g                    Track histogram of PCs\n");
   fprintf(stderr, "  -l                    Generate a log of execution\n");
+#ifdef HAVE_BOOST_ASIO
+  fprintf(stderr, "  -s                    Command I/O via socket (use with -d)\n");
+#endif
   fprintf(stderr, "  -h, --help            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);
@@ -208,6 +213,7 @@ int main(int argc, char** argv)
   bool halted = false;
   bool histogram = false;
   bool log = false;
+  bool socket = false;  // command line option -s
   bool dump_dts = false;
   bool dtb_enabled = true;
   bool real_time_clint = false;
@@ -308,6 +314,9 @@ int main(int argc, char** argv)
   parser.option('d', 0, 0, [&](const char* s){debug = true;});
   parser.option('g', 0, 0, [&](const char* s){histogram = true;});
   parser.option('l', 0, 0, [&](const char* s){log = true;});
+#ifdef HAVE_BOOST_ASIO
+  parser.option('s', 0, 0, [&](const char* s){socket = true;});
+#endif
   parser.option('p', 0, 1, [&](const char* s){nprocs = atoul_nonzero_safe(s);});
   parser.option('m', 0, 1, [&](const char* s){mems = make_mems(s);});
   // I wanted to use --halted, but for some reason that doesn't work.
@@ -398,6 +407,22 @@ 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
   tcp::acceptor *acceptor_ptr = NULL;
+  if (socket) {  // if command line option -s is set
+     try
+     { // create socket server
+       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
+       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;
+     }
+  }
 #endif
 
   sim_t s(isa, priv, varch, nprocs, halted, real_time_clint,