diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/Makefile.in | 3 | ||||
| -rw-r--r-- | gdb/ppc-linux-tdep.c | 6 | ||||
| -rw-r--r-- | gdb/target.c | 23 | ||||
| -rw-r--r-- | gdb/target.h | 12 |
5 files changed, 48 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2d00a07..a34ac63 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2003-10-24 Andrew Cagney <cagney@redhat.com> + * target.c: Include "gdbcore.h". + (get_target_memory, get_target_memory_unsigned): New functions. + * target.h (get_target_memory, get_target_memory_unsigned): Declare. + * ppc-linux-tdep.c (ppc64_linux_convert_from_func_ptr_addr): + Use get_target_memory_unsigned. + * Makefile.in (target.o): Update dependencies. + +2003-10-24 Andrew Cagney <cagney@redhat.com> + * osabi.c (gdbarch_init_osabi): Fix typos, and "fortunatly"[sic]. * PROBLEMS, arch-utils.c, cli-out.c, command.h: Ditto. * complaints.c, cris-tdep.c, disasm.c, dwarf2-frame.c: Ditto. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index d5f2d0a..d7d8eb6 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2367,7 +2367,8 @@ symtab.o: symtab.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(gdbcore_h) \ $(block_h) $(dictionary_h) $(gdb_string_h) $(gdb_stat_h) $(cp_abi_h) target.o: target.c $(defs_h) $(gdb_string_h) $(target_h) $(gdbcmd_h) \ $(symtab_h) $(inferior_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ - $(gdb_wait_h) $(dcache_h) $(regcache_h) $(gdb_assert_h) + $(gdb_wait_h) $(dcache_h) $(regcache_h) $(gdb_assert_h) \ + $(gdbcore_h) thread.o: thread.c $(defs_h) $(symtab_h) $(frame_h) $(inferior_h) \ $(environ_h) $(value_h) $(target_h) $(gdbthread_h) $(command_h) \ $(gdbcmd_h) $(regcache_h) $(gdb_h) $(gdb_string_h) $(ui_out_h) diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 4bb8326..6270292 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -936,13 +936,11 @@ ppc64_linux_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr, struct target_ops *targ) { - struct obj_section *s; - - s = find_pc_section (addr); + struct section_table *s = target_section_by_addr (targ, addr); /* Check if ADDR points to a function descriptor. */ if (s && strcmp (s->the_bfd_section->name, ".opd") == 0) - return read_memory_unsigned_integer (addr, 8); + return get_target_memory_unsigned (targ, addr, 8); return addr; } diff --git a/gdb/target.c b/gdb/target.c index 6a520b1..e99d947 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -37,6 +37,7 @@ #include <signal.h> #include "regcache.h" #include "gdb_assert.h" +#include "gdbcore.h" static void target_info (char *, int); @@ -1214,6 +1215,28 @@ target_write (struct target_ops *ops, return len; } +/* Memory transfer methods. */ + +void +get_target_memory (struct target_ops *ops, CORE_ADDR addr, void *buf, + LONGEST len) +{ + if (target_read (ops, TARGET_OBJECT_MEMORY, NULL, buf, addr, len) + != len) + memory_error (EIO, addr); +} + +ULONGEST +get_target_memory_unsigned (struct target_ops *ops, + CORE_ADDR addr, int len) +{ + char buf[sizeof (ULONGEST)]; + + gdb_assert (len <= sizeof (buf)); + get_target_memory (ops, addr, buf, len); + return extract_unsigned_integer (buf, len); +} + static void target_info (char *args, int from_tty) { diff --git a/gdb/target.h b/gdb/target.h index 03a7fd8..2fb3381 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -248,6 +248,18 @@ extern LONGEST target_write (struct target_ops *ops, enum target_object object, const char *annex, const void *buf, ULONGEST offset, LONGEST len); + +/* Wrappers to target read/write that perform memory transfers. They + throw an error if the memory transfer fails. + + NOTE: cagney/2003-10-23: The naming schema is lifted from + "frame.h". The parameter order is lifted from get_frame_memory, + which in turn lifted it from read_memory. */ + +extern void get_target_memory (struct target_ops *ops, CORE_ADDR addr, + void *buf, LONGEST len); +extern ULONGEST get_target_memory_unsigned (struct target_ops *ops, + CORE_ADDR addr, int len); /* If certain kinds of activity happen, target_wait should perform |