Debugger disassemble defaults to 4 instructions. Disasembler in debugger now replaces breakpoint opcode with real if it was replaced. Fix bug when setting breakpoint at same location twice.

arr committed 10 years ago

Commit f29cf0d1 parent 754ca824 files · +38 −6Browse files

Showing the changes to src/vm/tool_dispatch.cpp (1 of 4 files). Show all

Unified · Split

src/vm/tool_dispatch.cpp+1−1

@@ -251,7 +251,7 @@ cookie_t vm_tool_dispatch_t::set_breakpoint(std::shared_ptr<vm_module_t> module, · 250 unmodified lines
251	const auto cookie_id = _breakpoints.cookie_counter++;	251	const auto cookie_id = _breakpoints.cookie_counter++;
252		252
253	// Map the cookie to the module/pc pair.	253	// Map the cookie to the module/pc pair.
254	_breakpoints.cookie_to_details[cookie_id] = { module, pc };	254	_breakpoints.cookie_to_details[cookie_id] = { module, pc, real_opcode };
255		255
256	// Record the original opcode	256	// Record the original opcode
257	auto &pc_map = _breakpoints.original_opcodes[reinterpret_cast<std::uintptr_t>(module.get())];	257	auto &pc_map = _breakpoints.original_opcodes[reinterpret_cast<std::uintptr_t>(module.get())];