Change debugger options to enumeration. Alter how the debugger displays the registers. Adding a breakpoint that is already set is a no-op and simply returns the current cookie value. Fix bug in print for the Sys module - don't ignore format modifiers.

arr committed 10 years ago

Commit db76c0c1 parent f29cf0d6 files · +45 −41Browse files

Showing the changes to src/exec/debugger.cpp (1 of 6 files). Show all

Unified · Split

         register_string
             << "  Thread ID:  " << r.thread.get_thread_id() << "\n"
-            << "     Module:  " << r.module_ref->module->module_name->str() << "  PC: " << r.pc << "\n"
+            << "         PC:  " << r.pc << "  Module:  " << r.module_ref->module->module_name->str() << "\n"
             << "     Opcode:  " << r.module_ref->code_section[r.pc].op << "\n";
         return register_string.str();
         if (pc < 0 || module->code_section.size() <= static_cast<std::size_t>(pc))
             throw debug_cmd_error_t{ "Invalid IP for module" };
-        try
+        cxt.dbg.breakpoint_cookies.emplace(cxt.dbg.controller->set_breakpoint(module, pc));
-        {
-            cxt.dbg.breakpoint_cookies.push_back(cxt.dbg.controller->set_breakpoint(module, pc));
-        }
-        catch (const vm_system_exception& e)
-        {
-            throw debug_cmd_error_t{ e.what() };
-        }
     }
     void cmd_breakpoint_clear(const std::vector<std::string> &a, dbg_cmd_cxt_t &cxt)
 std::ostream& operator<<(std::ostream &ss, const debugger_options o)
 {
-    ss << "Break on enter: " << std::boolalpha << o.break_on_enter << "\n"
+    ss << "Break on enter: " << std::boolalpha << util::has_flag(o, debugger_options::break_on_enter) << "\n"
-       << "Break on module load: " << std::boolalpha << o.break_on_module_load << "\n"
+       << "Break on module load: " << std::boolalpha << util::has_flag(o, debugger_options::break_on_module_load) << "\n"
-       << "Break on exception: " << std::boolalpha << o.break_on_exception << "\n";
+       << "Break on exception: " << std::boolalpha << util::has_flag(o, debugger_options::break_on_exception) << "\n";
     return ss;
 }
-debugger::debugger(const debugger_options &opt)
+debugger::debugger(const debugger_options opt)
     : _options{ opt }
     , _tool_id{ 0 }
     , controller{ nullptr }
     _tool_id = tool_id;
     controller = &controller_;
-    _event_cookies.push_back(controller->subscribe_event(vm_event_t::thread_begin, [](vm_event_t, vm_event_context_t &cxt)
+    _event_cookies.emplace(controller->subscribe_event(vm_event_t::thread_begin, [](vm_event_t, vm_event_context_t &cxt)
     {
         auto t = cxt.value1.thread;
         auto ss = std::stringstream{};
         debug_print_info(ss.str());
     }));
-    _event_cookies.push_back(controller->subscribe_event(vm_event_t::thread_end, [](vm_event_t, vm_event_context_t &cxt)
+    _event_cookies.emplace(controller->subscribe_event(vm_event_t::thread_end, [](vm_event_t, vm_event_context_t &cxt)
     {
         auto ss = std::stringstream{};
         ss << "Thread "
         debug_print_info(ss.str());
     }));
-    _event_cookies.push_back(controller->subscribe_event(vm_event_t::exception_raised, [&](vm_event_t, vm_event_context_t &cxt)
+    _event_cookies.emplace(controller->subscribe_event(vm_event_t::exception_raised, [&](vm_event_t, vm_event_context_t &cxt)
     {
         auto ss = std::stringstream{};
         ss << "Exception '"
         debug_print_info(ss.str());
-        if (_options.break_on_exception)
+        if (util::has_flag(_options, debugger_options::break_on_exception))
             prompt(*this, *cxt.value1.registers);
     }));
-    _event_cookies.push_back(controller->subscribe_event(vm_event_t::exception_unhandled, [&](vm_event_t, vm_event_context_t &cxt)
+    _event_cookies.emplace(controller->subscribe_event(vm_event_t::exception_unhandled, [&](vm_event_t, vm_event_context_t &cxt)
     {
         auto ss = std::stringstream{};
         ss << "Unhandled exception '"
         prompt(*this, *cxt.value1.registers);
     }));
-    _event_cookies.push_back(controller->subscribe_event(vm_event_t::module_thread_load, [&](vm_event_t, vm_event_context_t &cxt)
+    _event_cookies.emplace(controller->subscribe_event(vm_event_t::module_thread_load, [&](vm_event_t, vm_event_context_t &cxt)
     {
         auto m = (*cxt.value2.module);
         auto ss = std::stringstream{};
         // If the break on enter flag was set, it will be true
         // and the first module load will be the user entry module.
-        if (_options.break_on_enter)
+        if (util::has_flag(_options, debugger_options::break_on_enter))
         {
             // Reset the break on enter flag and set a breakpoint
             // on the entry PC for the module - 'break on enter'
-            _options.break_on_enter = false;
+            _options ^= debugger_options::break_on_enter;
             controller->set_breakpoint(m, m->header.entry_pc);
         }
-        if (_options.break_on_module_load)
+        if (util::has_flag(_options, debugger_options::break_on_module_load))
             prompt(*this, *cxt.value1.registers);
     }));
-    _event_cookies.push_back(controller->subscribe_event(vm_event_t::breakpoint, [&](vm_event_t, vm_event_context_t &cxt)
+    _event_cookies.emplace(controller->subscribe_event(vm_event_t::breakpoint, [&](vm_event_t, vm_event_context_t &cxt)
     {
         auto ss = std::stringstream{};
         ss << "Breakpoint hit";