Author: martin
Date: 2007-10-31 10:13:55 -0500 (Wed, 31 Oct 2007)
New Revision: 88562
Modified:
branches/martin/debugger-plophos/debugger/backend/server/i386-arch.c
branches/martin/debugger-plophos/debugger/backend/server/x86_64-arch.c
Log:
Modified: branches/martin/debugger-plophos/debugger/backend/server/i386-arch.c
===================================================================
--- branches/martin/debugger-plophos/debugger/backend/server/i386-arch.c
2007-10-31 15:13:31 UTC (rev 88561)
+++ branches/martin/debugger-plophos/debugger/backend/server/i386-arch.c
2007-10-31 15:13:55 UTC (rev 88562)
@@ -621,24 +621,14 @@
breakpoint->runtime_table_slot = slot;
-#if 0
- g_message (G_STRLOC ": allocated slot %d for breakpoint %d: %Lx / %x",
slot,
- breakpoint->id, breakpoint->address, (guint8)
breakpoint->saved_insn);
-#endif
+ table_address = runtime->breakpoint_info_area + 8 * slot;
+ index_address = runtime->breakpoint_table + 4 * slot;
- table_address = runtime->breakpoint_info_area + 16 * slot;
- index_address = runtime->breakpoint_table + 8 * slot;
-
-#if 0
- g_message (G_STRLOC ": table address is %Lx / index address is %Lx",
- table_address, index_address);
-#endif
-
result = server_ptrace_poke_word (handle, table_address,
breakpoint->address);
if (result != COMMAND_ERROR_NONE)
return result;
- result = server_ptrace_poke_word (handle, table_address, (gsize)
breakpoint->saved_insn);
+ result = server_ptrace_poke_word (handle, table_address + 4, (gsize)
breakpoint->saved_insn);
if (result != COMMAND_ERROR_NONE)
return result;
@@ -660,17 +650,9 @@
runtime = handle->mono_runtime;
g_assert (runtime);
-#if 0
- g_message (G_STRLOC ": freeing breakpoint slot %d",
breakpoint->runtime_table_slot);
-#endif
-
slot = breakpoint->runtime_table_slot;
index_address = runtime->breakpoint_table + runtime->address_size *
slot;
-#if 0
- g_message (G_STRLOC ": index address is %Lx", index_address);
-#endif
-
result = server_ptrace_poke_word (handle, index_address, 0);
if (result != COMMAND_ERROR_NONE)
return result;
Modified: branches/martin/debugger-plophos/debugger/backend/server/x86_64-arch.c
===================================================================
--- branches/martin/debugger-plophos/debugger/backend/server/x86_64-arch.c
2007-10-31 15:13:31 UTC (rev 88561)
+++ branches/martin/debugger-plophos/debugger/backend/server/x86_64-arch.c
2007-10-31 15:13:55 UTC (rev 88562)
@@ -485,20 +485,9 @@
breakpoint->runtime_table_slot = slot;
-#if 0
- g_message (G_STRLOC ": allocated slot %d for breakpoint %d: %Lx / %x",
slot,
- breakpoint->id, breakpoint->address, (guint8)
breakpoint->saved_insn);
-#endif
-
table_address = runtime->breakpoint_info_area + 16 * slot;
index_address = runtime->breakpoint_table + 8 * slot;
-#if 0
- g_message (G_STRLOC ": table address is %Lx,%Lx / index address is
%Lx,%Lx",
- runtime->breakpoint_info_area, table_address,
runtime->breakpoint_table,
- index_address);
-#endif
-
result = server_ptrace_poke_word (handle, table_address,
breakpoint->address);
if (result != COMMAND_ERROR_NONE)
return result;
@@ -527,17 +516,9 @@
return COMMAND_ERROR_NONE;
-#if 0
- g_message (G_STRLOC ": freeing breakpoint slot %d",
breakpoint->runtime_table_slot);
-#endif
-
slot = breakpoint->runtime_table_slot;
index_address = runtime->breakpoint_table + runtime->address_size *
slot;
-#if 0
- g_message (G_STRLOC ": index address is %Lx", index_address);
-#endif
-
result = server_ptrace_poke_word (handle, index_address, 0);
if (result != COMMAND_ERROR_NONE)
return result;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
