Author: martin
Date: 2007-06-21 09:28:45 -0400 (Thu, 21 Jun 2007)
New Revision: 80473
Modified:
trunk/debugger/ChangeLog
trunk/debugger/backend/server/x86-linux-ptrace.c
trunk/debugger/backend/server/x86-linux-ptrace.h
trunk/debugger/backend/server/x86-ptrace.c
Log:
2007-06-21 Martin Baulig <[EMAIL PROTECTED]>
* backend/server/x86-linux-ptrace.c
(server_ptrace_read_memory): Moved the actual reading into
_server_ptrace_read_memory(), just remove the breakpoints here.
(_server_ptrace_read_memory): Like server_ptrace_read_memory(),
but don't remove any breakpoints.
* backend/server/x86-ptrace.c
(server_ptrace_write_memory): Use _server_ptrace_read_memory().
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2007-06-21 13:27:31 UTC (rev 80472)
+++ trunk/debugger/ChangeLog 2007-06-21 13:28:45 UTC (rev 80473)
@@ -1,5 +1,16 @@
2007-06-21 Martin Baulig <[EMAIL PROTECTED]>
+ * backend/server/x86-linux-ptrace.c
+ (server_ptrace_read_memory): Moved the actual reading into
+ _server_ptrace_read_memory(), just remove the breakpoints here.
+ (_server_ptrace_read_memory): Like server_ptrace_read_memory(),
+ but don't remove any breakpoints.
+
+ * backend/server/x86-ptrace.c
+ (server_ptrace_write_memory): Use _server_ptrace_read_memory().
+
+2007-06-21 Martin Baulig <[EMAIL PROTECTED]>
+
* backend/MonoThreadManager.cs
(MonoDebuggerInfo.MaxDynamicVersion): Allow 59 here; keep
`MinDynamicVersion' at 58. The new `debugger-dublin' branch uses
Modified: trunk/debugger/backend/server/x86-linux-ptrace.c
===================================================================
--- trunk/debugger/backend/server/x86-linux-ptrace.c 2007-06-21 13:27:31 UTC
(rev 80472)
+++ trunk/debugger/backend/server/x86-linux-ptrace.c 2007-06-21 13:28:45 UTC
(rev 80473)
@@ -59,8 +59,7 @@
}
static ServerCommandError
-server_ptrace_read_memory (ServerHandle *handle, guint64 start,
- guint32 size, gpointer buffer)
+_server_ptrace_read_memory (ServerHandle *handle, guint64 start, guint32 size,
gpointer buffer)
{
guint8 *ptr = buffer;
guint32 old_size = size;
@@ -81,8 +80,16 @@
ptr += ret;
}
- x86_arch_remove_breakpoints_from_target_memory (handle, start,
old_size, buffer);
+ return COMMAND_ERROR_NONE;
+}
+static ServerCommandError
+server_ptrace_read_memory (ServerHandle *handle, guint64 start, guint32 size,
gpointer buffer)
+{
+ ServerCommandError result = _server_ptrace_read_memory (handle, start,
size, buffer);
+ if (result != COMMAND_ERROR_NONE)
+ return result;
+ x86_arch_remove_breakpoints_from_target_memory (handle, start, size,
buffer);
return COMMAND_ERROR_NONE;
}
Modified: trunk/debugger/backend/server/x86-linux-ptrace.h
===================================================================
--- trunk/debugger/backend/server/x86-linux-ptrace.h 2007-06-21 13:27:31 UTC
(rev 80472)
+++ trunk/debugger/backend/server/x86-linux-ptrace.h 2007-06-21 13:28:45 UTC
(rev 80473)
@@ -16,6 +16,10 @@
_server_ptrace_set_fp_registers (InferiorHandle *inferior,
INFERIOR_FPREGS_TYPE *regs);
static ServerCommandError
+_server_ptrace_read_memory (ServerHandle *handle, guint64 start,
+ guint32 size, gpointer buffer);
+
+static ServerCommandError
server_ptrace_read_memory (ServerHandle *handle, guint64 start, guint32 size,
gpointer buffer);
static ServerCommandError
Modified: trunk/debugger/backend/server/x86-ptrace.c
===================================================================
--- trunk/debugger/backend/server/x86-ptrace.c 2007-06-21 13:27:31 UTC (rev
80472)
+++ trunk/debugger/backend/server/x86-ptrace.c 2007-06-21 13:28:45 UTC (rev
80473)
@@ -160,7 +160,7 @@
if (!size)
return COMMAND_ERROR_NONE;
- result = server_ptrace_read_memory (handle, addr, sizeof (long), &temp);
+ result = _server_ptrace_read_memory (handle, addr, sizeof (long),
&temp);
if (result != COMMAND_ERROR_NONE)
return result;
memcpy (&temp, ptr, size);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
