From 0c012db1eb9c6b7c951e60cb74d0f6d7bb8738f9 Mon Sep 17 00:00:00 2001
From: Kevin Buettner <kevinb@redhat.com>
Date: Tue, 10 Aug 2010 04:39:26 +0000
Subject: [PATCH] * remote-sim.c (gdbsim_xfer_inferior_memory): Replace
`target_has_execution' check with `to_has_memory' check.
(gdbsim_has_all_memory, gdbsim_has_memory): New functions.
(init_gdbsym_ops): Initialize relevant fields of `gdbsim_ops' with
`gdbsim_has_all_memory' and `gdbsim_has_memory'.
---
gdb/ChangeLog | 8 ++++++++
gdb/remote-sim.c | 38 ++++++++++++++++++++++++++++++++------
2 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f051943f58a..b803360f44a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-09 Kevin Buettner <kevinb@redhat.com>
+
+ * remote-sim.c (gdbsim_xfer_inferior_memory): Replace
+ `target_has_execution' check with `to_has_memory' check.
+ (gdbsim_has_all_memory, gdbsim_has_memory): New functions.
+ (init_gdbsym_ops): Initialize relevant fields of `gdbsim_ops'
+ with `gdbsim_has_all_memory' and `gdbsim_has_memory'.
+
2010-08-09 Kevin Buettner <kevinb@redhat.com>
* remote-sim.c (program_loaded, gdbsim_desc, remote_sim_ptid)
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index ba4054d8baf..9b7a7b4db5b 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1063,10 +1063,10 @@ gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
struct sim_inferior_data *sim_data
= get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
- /* If no program is running yet, then ignore the simulator for
- memory. Pass the request down to the next target, hopefully
- an exec file. */
- if (!target_has_execution)
+ /* If this target doesn't have memory yet, return 0 causing the
+ request to be passed to a lower target, hopefully an exec
+ file. */
+ if (!target->to_has_memory (target))
return 0;
if (!sim_data->program_loaded)
@@ -1210,6 +1210,32 @@ gdbsim_pid_to_str (struct target_ops *ops, ptid_t ptid)
return normal_pid_to_str (ptid);
}
+/* Simulator memory may be accessed after the program has been loaded. */
+
+int
+gdbsim_has_all_memory (struct target_ops *ops)
+{
+ struct sim_inferior_data *sim_data
+ = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
+
+ if (!sim_data->program_loaded)
+ return 0;
+
+ return 1;
+}
+
+int
+gdbsim_has_memory (struct target_ops *ops)
+{
+ struct sim_inferior_data *sim_data
+ = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NOT_NEEDED);
+
+ if (!sim_data->program_loaded)
+ return 0;
+
+ return 1;
+}
+
/* Define the target subroutine names */
struct target_ops gdbsim_ops;
@@ -1240,8 +1266,8 @@ init_gdbsim_ops (void)
gdbsim_ops.to_thread_alive = gdbsim_thread_alive;
gdbsim_ops.to_pid_to_str = gdbsim_pid_to_str;
gdbsim_ops.to_stratum = process_stratum;
- gdbsim_ops.to_has_all_memory = default_child_has_all_memory;
- gdbsim_ops.to_has_memory = default_child_has_memory;
+ gdbsim_ops.to_has_all_memory = gdbsim_has_all_memory;
+ gdbsim_ops.to_has_memory = gdbsim_has_memory;
gdbsim_ops.to_has_stack = default_child_has_stack;
gdbsim_ops.to_has_registers = default_child_has_registers;
gdbsim_ops.to_has_execution = default_child_has_execution;