Set breakpoint now defaults to using the current module if module is not defined.

arr committed 10 years ago

Commit 551c5001 parent db76c0c1 file · +24 −20Browse files

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

Unified · Split

     void cmd_breakpoint_set(const std::vector<std::string> &a, dbg_cmd_cxt_t &cxt)
     {
-        if (a.size() < 3)
+        if (a.size() < 2)
-            throw debug_cmd_error_t{ "Must supply an IP and module ID" };
+            throw debug_cmd_error_t{ "Must supply an IP" };
         vm_pc_t pc;
         try
             throw debug_cmd_error_t{ "Invalid IP format" };
         }
-        uint32_t module_id;
+        auto module = std::const_pointer_cast<vm_module_t>(cxt.current_register->module_ref->module);
-        try
+        if (a.size() > 2)
-        {
-            module_id = std::stoul(a[2]);
-        }
-        catch (...)
         {
-            throw debug_cmd_error_t{ "Invalid module ID format" };
+            module.reset();
-        }
+            uint32_t module_id;
+            try
+            {
+                module_id = std::stoul(a[2]);
+            }
+            catch (...)
+            {
+                throw debug_cmd_error_t{ "Invalid module ID format" };
+            }
-        auto module = std::shared_ptr<vm_module_t>{};
+            cxt.vm.enum_loaded_modules([module_id, &module](const loaded_vm_module_t &m)
-        cxt.vm.enum_loaded_modules([module_id, &module](const loaded_vm_module_t &m)
+            {
-        {
+                if (module_id != m.load_id)
-            if (module_id != m.load_id)
+                    return true;
-                return true;
-            // Found the matching ID so stop
+                // Found the matching ID so stop
-            module = m.module.lock();
+                module = m.module.lock();
-            return false;
+                return false;
-        });
+            });
+        }
         if (module == nullptr)
         {
         { "t", "Print all threads", nullptr, nullptr, cmd_print_threads },
         { "m", "Print all loaded modules", nullptr, nullptr, cmd_print_modules },
-        { "bs", "Set breakpoint at the specified IP in a loaded module", "bs [0-9]+ [0-9]+", "bs 3 5 (Breakpoint at IP 3 in module 5)", cmd_breakpoint_set },
+        { "bs", "Set breakpoint at the specified IP in a loaded module", "bs [0-9]+ [0-9]*", "bs 3 5 (Breakpoint at IP 3 in module 5), bs 4 (Breakpoint at IP 4 in current module)", cmd_breakpoint_set },
         { "bc", "Clear breakpoint(s)", "bc ([0-9]+|\\*)", "bc 3, bc *", cmd_breakpoint_clear },
         { "bl", "List breakpoints", nullptr, nullptr, cmd_breakpoint_list },