WIP

Author: skuntz

src/sst/core/impl/interactive/simpleDebug.cc

@@ -30,6 +30,25 @@
 
 namespace SST::IMPL::Interactive {
 
+    // Static initialization
+    //bool SimpleDebugger::done = false;
+    bool SimpleDebugger::autoCompleteEnable = true;
+    std::ofstream SimpleDebugger::loggingFile;
+    std::ifstream SimpleDebugger::replayFile;
+    std::string SimpleDebugger::loggingFilePath = "sst-console.out";
+    std::string SimpleDebugger::replayFilePath = "sst-console.in";
+    bool SimpleDebugger::enLogging = false;
+    std::stringstream SimpleDebugger::injectedCommand;
+    ExecState SimpleDebugger::eState = {};
+    std::stack<ExecState> SimpleDebugger::eStack = {};
+    bool SimpleDebugger::confirm = true;
+    CommandRegistry SimpleDebugger::cmdRegistry;
+    CommandHistoryBuffer SimpleDebugger::cmdHistoryBuf;
+    CmdLineEditor   SimpleDebugger::cmdLineEditor;
+    LINE_ENTRY_MODE SimpleDebugger::line_entry_mode = LINE_ENTRY_MODE::NORMAL;
+    uint32_t SimpleDebugger::verbosity = 0;
+
+
 SimpleDebugger::SimpleDebugger(Params& params) :
     InteractiveConsole()
 {
@@ -207,6 +226,8 @@ SimpleDebugger::SimpleDebugger(Params& params) :
 
     // Callback for directory listing strings
     cmdLineEditor.set_listing_callback([this](std::list<std::string>& vec) { get_listing_strings(vec); });
+
+    
 }
 
 SimpleDebugger::~SimpleDebugger()
@@ -257,9 +278,10 @@ SimpleDebugger::execute(const std::string& msg)
         getCurrentSimCycle());
     printf("%s\n", msg.c_str());
 
-    if ( nullptr == obj_ ) {
+    //if ( nullptr == obj_ ) {
         obj_ = getComponentObjectMap();
-    }
+        assert(obj_);
+    //}
     done     = false;
     retState = DONE;
 
@@ -626,6 +648,7 @@ SimpleDebugger::cmd_pwd(std::vector<std::string>& UNUSED(tokens))
 void
 SimpleDebugger::cmd_ls(std::vector<std::string>& UNUSED(tokens))
 {
+    assert(obj_);
     auto& vars = obj_->getVariables();
     for ( auto& x : vars ) {
         if ( x.second->isFundamental() ) {

src/sst/core/impl/interactive/simpleDebug.h

@@ -265,35 +265,35 @@ class SimpleDebugger : public SST::InteractiveConsole
     std::vector<std::string> name_stack;
 
     SST::Core::Serialization::ObjectMap* obj_     = nullptr;
-    bool                                 done     = false;
+    bool                                 done = false;
     int                                  retState = -1; // -1 DONE, -2 SUMAMRY, positive number is threadID
 
-    bool autoCompleteEnable = true;
+    static bool autoCompleteEnable; //skk = true;
 
     // gdb/lldb thread spin support
     uint64_t spinner = 1;
 
     // logging support
-    std::ofstream loggingFile;
-    std::ifstream replayFile;
-    std::string   loggingFilePath = "sst-console.out";
-    std::string   replayFilePath  = "sst-console.in";
-    bool          enLogging       = false;
+    static std::ofstream loggingFile;
+    static std::ifstream replayFile;
+    static std::string   loggingFilePath; //skk = "sst-console.out";
+    static std::string   replayFilePath; //skk = "sst-console.in";
+    static bool          enLogging; //skk = false;
 
     // command injection (for sst --replay option)
-    std::stringstream injectedCommand;
+    static std::stringstream injectedCommand;
 
     // execution state management for nested user commands
-    ExecState             eState = {};
-    std::stack<ExecState> eStack = {};
+    static ExecState             eState; //skk = {};
+    static std::stack<ExecState> eStack; //skk = {};
 
     // Keep a pointer to the ObjectMap for the top level Component
     SST::Core::Serialization::ObjectMapDeferred<BaseComponent>* base_comp_ = nullptr;
 
     // Keep track of all the WatchPoints
     std::vector<std::pair<WatchPoint*, BaseComponent*>> watch_points_;
     bool                                                clear_watchlist();
-    bool                                                confirm = true; // Ask for confirmation to clear watchlist
+    static bool                                         confirm; //skk = true; // Ask for confirmation to clear watchlist
 
     std::vector<std::string> tokenize(std::vector<std::string>& tokens, const std::string& input);
 
@@ -353,17 +353,17 @@ class SimpleDebugger : public SST::InteractiveConsole
     void dispatch_cmd(std::string& cmd);
 
     // Command Registry
-    CommandRegistry cmdRegistry;
+    static CommandRegistry cmdRegistry;
 
     // Command History
-    CommandHistoryBuffer cmdHistoryBuf;
+    static CommandHistoryBuffer cmdHistoryBuf;
 
     // Command Line Editor
-    CmdLineEditor   cmdLineEditor;
-    LINE_ENTRY_MODE line_entry_mode = LINE_ENTRY_MODE::NORMAL;
+    static CmdLineEditor   cmdLineEditor;
+    static LINE_ENTRY_MODE line_entry_mode; //skk = LINE_ENTRY_MODE::NORMAL;
 
     // Verbosity controlled console printing
-    uint32_t verbosity = 0;
+    static uint32_t verbosity; //skk = 0;
     void     msg(VERBOSITY_MASK mask, std::string message);
 };