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/vm/tool_dispatch.cpp (1 of 6 files). Show all

Unified · Split

     {
         std::lock_guard<std::mutex> lock{ _breakpoints.lock };
+        auto &pc_map = _breakpoints.original_opcodes[reinterpret_cast<std::uintptr_t>(module.get())];
+        // If the real opcode is already a breakpoint and it is known, return the current cookie.
         if (real_opcode == opcode_t::brkpt)
-            throw vm_system_exception{ "Breakpoint already set at PC" };
+        {
+            auto iter = pc_map.find(pc);
+            if (iter != pc_map.cend())
+                return iter->second.second;
+        }
         const auto cookie_id = _breakpoints.cookie_counter++;
         _breakpoints.cookie_to_details[cookie_id] = { module, pc, real_opcode };
         // Record the original opcode
-        auto &pc_map = _breakpoints.original_opcodes[reinterpret_cast<std::uintptr_t>(module.get())];
         pc_map[pc] = std::make_pair(real_opcode, cookie_id);
         // Replace the current opcode with breakpoint